From 282b9c4b20dde96446cb093596c0c807a16e9167 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Thu, 10 May 2018 09:38:14 +1000 Subject: [PATCH] Place iterate params after vars, not before --- lang/ast/ast.go | 10 +++++----- lang/parse/parse.go | 10 +++++----- std/adler32/common_adler32.wuffs | 2 +- std/crc32/common_crc32.wuffs | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index d22bda5d..28f810a3 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -516,13 +516,13 @@ func NewIOBind(in_fields []*Node, body []*Node) *IOBind { } // Iterate is -// "iterate:ID1 (length:ID2, unroll:ID0)(vars), List1 { List2 } else { List3 }": +// "iterate:ID1 (vars)(length:ID2, unroll:ID0), List1 { List2 } else { List3 }": // - FlagsHasBreak is the iterate has an explicit break // - FlagsHasContinue is the iterate has an explicit continue // - ID0: unroll // - ID1: <0|label> // - ID2: length -// - List0: variables +// - List0: vars // - List1: asserts // - List2: body // - List3: tail @@ -542,13 +542,13 @@ func (n *Iterate) Tail() []*Node { return n.list3 } func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak } func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue } -func NewIterate(label t.ID, length t.ID, unroll t.ID, variables []*Node, asserts []*Node, body []*Node, tail []*Node) *Iterate { +func NewIterate(label t.ID, vars []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, tail []*Node) *Iterate { return &Iterate{ kind: KIterate, id0: unroll, id1: label, id2: length, - list0: variables, + list0: vars, list1: asserts, list2: body, list3: tail, @@ -587,7 +587,7 @@ func NewWhile(label t.ID, condition *Expr, asserts []*Node, body []*Node) *While } } -// If is "if MHS { List0 } else RHS" or "if MHS { List0 } else { List1 }": +// If is "if MHS { List2 } else RHS" or "if MHS { List2 } else { List3 }": // - MHS: // - RHS: // - List2: if-true body diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 603bc3bc..7319b795 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -734,6 +734,10 @@ func (p *parser) parseIterateNode() (*a.Node, error) { if err != nil { return nil, err } + vars, err := p.parseList(t.IDCloseParen, (*parser).parseIterateVarNode) + if err != nil { + return nil, err + } if x := p.peek1(); x != t.IDOpenParen { got := p.tm.ByID(x) @@ -791,10 +795,6 @@ func (p *parser) parseIterateNode() (*a.Node, error) { } p.src = p.src[1:] - vars, err := p.parseList(t.IDCloseParen, (*parser).parseIterateVarNode) - if err != nil { - return nil, err - } asserts, err := p.parseAsserts() if err != nil { return nil, err @@ -822,7 +822,7 @@ func (p *parser) parseIterateNode() (*a.Node, error) { } } - return a.NewIterate(label, length, unroll, vars, asserts, body, tail).Node(), nil + return a.NewIterate(label, vars, length, unroll, asserts, body, tail).Node(), nil } func (p *parser) parseArgNode() (*a.Node, error) { diff --git a/std/adler32/common_adler32.wuffs b/std/adler32/common_adler32.wuffs index 8a3153f9..b7b9cc1f 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 (p slice base.u8 =: in.x)(length:1, unroll:8) { 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 09786a03..61d53e68 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 (p slice base.u8 =: in.x)(length:8, unroll:8) { // TODO: explain the slicing-by-8 algorithm. s ^= ((p[0] as base.u32) << 0) | ((p[1] as base.u32) << 8) |