From 931fdce47560acfcc60106bb9e86fb45a22bf5bc Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 23 Feb 2019 17:15:57 +1100 Subject: [PATCH] Rename "yield foo" to "yield? foo" --- lang/parse/parse.go | 10 ++++++++-- lang/render/render.go | 2 ++ std/deflate/decode_deflate.wuffs | 6 +++--- std/deflate/decode_huffman_slow.wuffs | 6 +++--- std/gif/decode_gif.wuffs | 2 +- std/gzip/decode_gzip.wuffs | 2 +- std/lzw/decode_lzw.wuffs | 4 ++-- std/zlib/decode_zlib.wuffs | 2 +- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 7c2e1b88..89f6468b 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -642,8 +642,14 @@ func (p *parser) parseStatement1() (*a.Node, error) { case t.IDReturn, t.IDYield: p.src = p.src[1:] - if x == t.IDYield && !p.funcEffect.Coroutine() { - return nil, fmt.Errorf(`parse: yield within non-coroutine at %s:%d`, p.filename, p.line()) + if x == t.IDYield { + if !p.funcEffect.Coroutine() { + return nil, fmt.Errorf(`parse: yield within non-coroutine at %s:%d`, p.filename, p.line()) + } + if p.peek1() != t.IDQuestion { + return nil, fmt.Errorf(`parse: yield not followed by '?' at %s:%d`, p.filename, p.line()) + } + p.src = p.src[1:] } value, err := p.parseExpr() if err != nil { diff --git a/lang/render/render.go b/lang/render/render.go index 4b99b6c2..1265dd6c 100644 --- a/lang/render/render.go +++ b/lang/render/render.go @@ -164,6 +164,8 @@ func Render(w io.Writer, tm *t.Map, src []t.Token, comments []string) (err error return errors.New("render: too many \"}\" tokens") } indent-- + } else if (tok.ID == t.IDQuestion) && (prevID == t.IDYield) { + buf = append(buf, ' ') } prevIsTightRight = tok.ID.IsTightRight() diff --git a/std/deflate/decode_deflate.wuffs b/std/deflate/decode_deflate.wuffs index 8c3f6a03..b84925cd 100644 --- a/std/deflate/decode_deflate.wuffs +++ b/std/deflate/decode_deflate.wuffs @@ -188,7 +188,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb this.history_index = (this.history_index & 0x7FFF) + ((n_copied & 0x7FFF) as base.u32) + already_full } } - yield status + yield? status } } @@ -275,9 +275,9 @@ pri func decoder.decode_uncompressed?(dst base.io_writer, src base.io_reader) { } length -= n_copied if args.dst.available() == 0 { - yield base."$short write" + yield? base."$short write" } else { - yield base."$short read" + yield? base."$short read" } } } diff --git a/std/deflate/decode_huffman_slow.wuffs b/std/deflate/decode_huffman_slow.wuffs index 6294e37e..7f3ef081 100644 --- a/std/deflate/decode_huffman_slow.wuffs +++ b/std/deflate/decode_huffman_slow.wuffs @@ -248,7 +248,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) { break } } - yield base."$short write" + yield? base."$short write" } // Copy from the start of this.history, if we wrapped around. if hlen > 0 { @@ -261,7 +261,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) { } hlen -= n_copied hdist ~mod+= n_copied - yield base."$short write" + yield? base."$short write" } } @@ -278,7 +278,7 @@ pri func decoder.decode_huffman_slow?(dst base.io_writer, src base.io_reader) { break } length -= n_copied - yield base."$short write" + yield? base."$short write" } } diff --git a/std/gif/decode_gif.wuffs b/std/gif/decode_gif.wuffs index e8b20fca..383c8afa 100644 --- a/std/gif/decode_gif.wuffs +++ b/std/gif/decode_gif.wuffs @@ -690,7 +690,7 @@ pri func decoder.decode_id_part2?(dst ptr base.pixel_buffer, src base.io_reader, break } while args.src.available() == 0 { - yield base."$short read" + yield? base."$short read" } if this.compressed_ri == this.compressed_wi { diff --git a/std/gzip/decode_gzip.wuffs b/std/gzip/decode_gzip.wuffs index b6409d3e..ff8302c7 100644 --- a/std/gzip/decode_gzip.wuffs +++ b/std/gzip/decode_gzip.wuffs @@ -120,7 +120,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb if status.is_ok() { break } - yield status + yield? status } checksum_want = args.src.read_u32le?() decoded_length_want = args.src.read_u32le?() diff --git a/std/lzw/decode_lzw.wuffs b/std/lzw/decode_lzw.wuffs index 341dab85..159287f5 100644 --- a/std/lzw/decode_lzw.wuffs +++ b/std/lzw/decode_lzw.wuffs @@ -114,7 +114,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb } else if this.read_from_return_value == 1 { continue } else if this.read_from_return_value == 2 { - yield base."$short read" + yield? base."$short read" } else if this.read_from_return_value == 3 { return "#bad code" } else { @@ -346,7 +346,7 @@ pri func decoder.write_to?(dst base.io_writer) { return ok } this.output_ri = (this.output_ri ~mod+ ((n & 0xFFFFFFFF) as base.u32)) & 8191 - yield base."$short write" + yield? base."$short write" } } diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 1529b386..5267121e 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -74,7 +74,7 @@ pub func decoder.decode_io_writer?(dst base.io_writer, src base.io_reader, workb if status.is_ok() { break } - yield status + yield? status } checksum_want = args.src.read_u32be?() if (not this.ignore_checksum) and (checksum_got != checksum_want) {