diff --git a/doc/changelog.md b/doc/changelog.md index 8b90c20a..5661524e 100644 --- a/doc/changelog.md +++ b/doc/changelog.md @@ -15,10 +15,9 @@ - Renamed `~+` to `~mod+`; added `~mod-`, `~sat+` and `~sat-`. - Removed `&^`. - Renamed `[N] T` and `[] T` types to `array[N] T` and `slice T`. -- Renamed `iterate.U` to `iterate (length:L, unroll:U)`. -- Changed iterate variable types from ptr T to slice T. - Renamed `buf1`, `reader1`, etc to `io_buffer`, `io_reader`, etc. - Renamed `u32`, `io_reader`, etc to `base.u32`, `base.io_reader`, etc. +- Redesigned iterate blocks. - Added a `base.image_config` type. - Tweaked how marks and limits work. - Supported animated (not just single frame) GIFs. diff --git a/lang/ast/ast.go b/lang/ast/ast.go index e9cb9445..d22bda5d 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -455,15 +455,15 @@ func NewAssign(operator t.ID, lhs *Expr, rhs *Expr) *Assign { } // Var is "var ID2 LHS" or "var ID2 LHS = RHS" or an iterate variable -// declaration "ID1 LHS : RHS": -// - ID0: <0|IDEq|IDColon> +// declaration "ID1 LHS =: RHS": +// - ID0: <0|IDEq|IDEqColon> // - ID2: name // - LHS: // - RHS: type Var Node func (n *Var) Node() *Node { return (*Node)(n) } -func (n *Var) IterateVariable() bool { return n.id0 == t.IDColon } +func (n *Var) IterateVariable() bool { return n.id0 == t.IDEqColon } func (n *Var) Name() t.ID { return n.id2 } func (n *Var) XType() *TypeExpr { return n.lhs.TypeExpr() } func (n *Var) Value() *Expr { return n.rhs.Expr() } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 2741fbff..603bc3bc 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -872,10 +872,10 @@ func (p *parser) parseVarNode(inIterate bool) (*a.Node, error) { op := t.ID(0) if inIterate { - op = t.IDColon - if x := p.peek1(); x != t.IDColon { + op = t.IDEqColon + if x := p.peek1(); x != t.IDEqColon { got := p.tm.ByID(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:] value, err = p.parseExpr() diff --git a/lang/token/list.go b/lang/token/list.go index cbd38b00..140a867f 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -238,6 +238,7 @@ const ( IDTildeModMinusEq = ID(0x1C) IDTildeSatPlusEq = ID(0x1D) IDTildeSatMinusEq = ID(0x1E) + IDEqColon = ID(0x1F) ) const ( @@ -495,6 +496,7 @@ var builtInsByID = [nBuiltInIDs]string{ IDTildeModMinusEq: "~mod-=", IDTildeSatPlusEq: "~sat+=", IDTildeSatMinusEq: "~sat-=", + IDEqColon: "=:", IDPlus: "+", IDMinus: "-", @@ -730,6 +732,7 @@ var lexers = [256][]suffixLexer{ }, '=': { {"=", IDEqEq}, + {":", IDEqColon}, {"", IDEq}, }, '<': { diff --git a/std/adler32/common_adler32.wuffs b/std/adler32/common_adler32.wuffs index 41417413..8a3153f9 100644 --- a/std/adler32/common_adler32.wuffs +++ b/std/adler32/common_adler32.wuffs @@ -34,7 +34,7 @@ pub func hasher.update(x slice base.u8)(checksum base.u32) { in.x = in.x[:5552] } - iterate (length:1, unroll:8)(p slice base.u8:in.x) { + iterate (length:1, unroll:8)(p slice base.u8 =: in.x) { s1 ~mod+= p[0] as base.u32 s2 ~mod+= s1 } diff --git a/std/crc32/common_crc32.wuffs b/std/crc32/common_crc32.wuffs index 18ed2bd6..09786a03 100644 --- a/std/crc32/common_crc32.wuffs +++ b/std/crc32/common_crc32.wuffs @@ -27,7 +27,7 @@ pub struct ieee_hasher?( pub func ieee_hasher.update(x slice base.u8)(checksum base.u32) { var s base.u32 = 0xFFFFFFFF ^ this.state - iterate (length:8, unroll:8)(p slice base.u8:in.x) { + iterate (length:8, unroll:8)(p slice base.u8 =: in.x) { // TODO: explain the slicing-by-8 algorithm. s ^= ((p[0] as base.u32) << 0) | ((p[1] as base.u32) << 8) |