diff --git a/doc/changelog.md b/doc/changelog.md index e324ce60..4b0a4ed2 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -14,6 +14,7 @@ - Renamed `std/flate` to `std/deflate`. - Renamed `buf1`, `reader1`, etc to `io_buffer`, `io_reader`, etc. - Renamed `[N] T` and `[] T` types to `array[N] T` and `slice T`. +- Renamed `iterate.N` to `iterate[N]`. - Supported animated (not just single frame) GIFs. - Marked the `std/gif` LZW decoder as private. - Marked some internal status codes as private. diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 1738f793..26e648cc 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -620,11 +620,17 @@ func (p *parser) parseStatement1() (*a.Node, error) { case t.KeyIterate: p.src = p.src[1:] - if x := p.peek1().Key(); x != t.KeyDot { + label, err := p.parseLabel() + if err != nil { + return nil, err + } + + if x := p.peek1().Key(); x != t.KeyOpenBracket { got := p.tm.ByKey(x) - return nil, fmt.Errorf(`parse: expected ".", got %q at %s:%d`, got, p.filename, p.line()) + return nil, fmt.Errorf(`parse: expected "[", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] + // TODO: allow expressions, not just literals, as unroll counts? unrollID := p.peek1() unrollStr := p.tm.ByKey(unrollID.Key()) if !unrollID.IsLiteral() { @@ -639,11 +645,12 @@ func (p *parser) parseStatement1() (*a.Node, error) { case "1", "2", "4", "8", "16", "32", "64", "128", "256": } unroll := a.NewExpr(0, 0, 0, unrollID, nil, nil, nil, nil) - - label, err := p.parseLabel() - if err != nil { - return nil, err + if x := p.peek1().Key(); x != t.KeyCloseBracket { + got := p.tm.ByKey(x) + return nil, fmt.Errorf(`parse: expected "]", got %q at %s:%d`, got, p.filename, p.line()) } + p.src = p.src[1:] + vars, err := p.parseList(t.KeyCloseParen, (*parser).parseIterateVariableNode) if err != nil { return nil, err diff --git a/std/crc32/decode_crc32.wuffs b/std/crc32/decode_crc32.wuffs index 1f75558b..4d7915bd 100644 --- a/std/crc32/decode_crc32.wuffs +++ b/std/crc32/decode_crc32.wuffs @@ -27,7 +27,7 @@ pub struct ieee?( pub func ieee.update(x slice u8)(checksum u32) { var s u32 = 0xFFFFFFFF ^ this.state - iterate.1 (p ptr u8:in.x) { + iterate[1](p ptr u8:in.x) { s = ieee_table[((s & 0xFF) as u8) ^ deref p] ^ (s >> 8) } diff --git a/std/zlib/decode_zlib.wuffs b/std/zlib/decode_zlib.wuffs index 8d70b1fb..99d35ea2 100644 --- a/std/zlib/decode_zlib.wuffs +++ b/std/zlib/decode_zlib.wuffs @@ -87,7 +87,7 @@ pri func adler32.update(x slice u8)(checksum u32) { in.x = in.x[:5552] } - iterate.8 (p ptr u8:in.x) { + iterate[8](p ptr u8:in.x) { s1 ~+= deref p as u32 s2 ~+= s1 }