From c511c53b1f38e185d1612ac4cfa036dd3b616446 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 4 May 2018 09:14:10 +1000 Subject: [PATCH] Clarify iterate step and unroll syntax --- lang/ast/ast.go | 5 ++-- lang/parse/parse.go | 46 ++++++++++++++++++++++++-------- lang/token/list.go | 4 +++ std/adler32/common_adler32.wuffs | 2 +- std/crc32/common_crc32.wuffs | 2 +- 5 files changed, 44 insertions(+), 15 deletions(-) diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 153d7446..e7a1fef7 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -515,7 +515,8 @@ func NewIOBind(in_fields []*Node, body []*Node) *IOBind { } } -// Iterate is "iterate[ID0, ID2]:ID1 (vars), List1 { List2 }": +// Iterate is +// "iterate:ID1 (step:ID2, unroll:ID0)(vars), List1 { List2 } else { List3 }": // - FlagsHasBreak is the iterate has an explicit break // - FlagsHasContinue is the iterate has an explicit continue // - ID0: unroll @@ -541,7 +542,7 @@ func (n *Iterate) Tail() []*Node { return n.list3 } func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak } func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue } -func NewIterate(unroll t.ID, step t.ID, label t.ID, variables []*Node, asserts []*Node, body []*Node, tail []*Node) *Iterate { +func NewIterate(label t.ID, step t.ID, unroll t.ID, variables []*Node, asserts []*Node, body []*Node, tail []*Node) *Iterate { return &Iterate{ kind: KIterate, id0: unroll, diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 956895b3..0e31c619 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -735,22 +735,21 @@ func (p *parser) parseIterateNode() (*a.Node, error) { return nil, err } - if x := p.peek1(); x != t.IDOpenBracket { + if x := p.peek1(); x != t.IDOpenParen { 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:] - unroll := p.peek1() - if unroll.SmallPowerOf2Value() == 0 { - return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1..256], got %q at %s:%d`, - p.tm.ByID(unroll), p.filename, p.line()) + if x := p.peek1(); x != t.IDStep { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "step", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] - if x := p.peek1(); x != t.IDComma { + if x := p.peek1(); x != t.IDColon { 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:] @@ -761,9 +760,34 @@ func (p *parser) parseIterateNode() (*a.Node, error) { } p.src = p.src[1:] - if x := p.peek1(); x != t.IDCloseBracket { + if x := p.peek1(); x != t.IDComma { 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:] + + if x := p.peek1(); x != t.IDUnroll { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected "unroll", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + + if x := p.peek1(); x != t.IDColon { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + + unroll := p.peek1() + if unroll.SmallPowerOf2Value() == 0 { + return nil, fmt.Errorf(`parse: expected power-of-2 unroll count in [1..256], got %q at %s:%d`, + p.tm.ByID(unroll), p.filename, p.line()) + } + p.src = p.src[1:] + + if x := p.peek1(); x != t.IDCloseParen { + got := p.tm.ByID(x) + return nil, fmt.Errorf(`parse: expected ")", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] @@ -798,7 +822,7 @@ func (p *parser) parseIterateNode() (*a.Node, error) { } } - return a.NewIterate(unroll, step, label, vars, asserts, body, tail).Node(), nil + return a.NewIterate(label, step, unroll, vars, asserts, body, tail).Node(), nil } func (p *parser) parseArgNode() (*a.Node, error) { diff --git a/lang/token/list.go b/lang/token/list.go index 45a62b3e..b0484a6c 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -441,6 +441,8 @@ const ( IDLowBits = ID(0xCE) IDHighBits = ID(0xCF) IDUnreadU8 = ID(0xD0) + IDStep = ID(0xD1) + IDUnroll = ID(0xD2) IDEmptyStruct = ID(0xF8) IDBool = ID(0xF9) @@ -623,6 +625,8 @@ var builtInsByID = [nBuiltInIDs]string{ IDLowBits: "low_bits", IDHighBits: "high_bits", IDUnreadU8: "unread_u8", + IDStep: "step", + IDUnroll: "unroll", IDEmptyStruct: "empty_struct", IDBool: "bool", diff --git a/std/adler32/common_adler32.wuffs b/std/adler32/common_adler32.wuffs index 7a88589d..f3a3b2a9 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[8, 1](p ptr base.u8:in.x) { + iterate (step:1, unroll:8)(p ptr base.u8:in.x) { s1 ~mod+= deref p as base.u32 s2 ~mod+= s1 } diff --git a/std/crc32/common_crc32.wuffs b/std/crc32/common_crc32.wuffs index d4d8dfff..eb9258df 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[1, 8](p ptr base.u8:in.x) { + iterate (step:8, unroll:1)(p ptr base.u8:in.x) { // TODO. } else { s = ieee_table[0][((s & 0xFF) as base.u8) ^ deref p] ^ (s >> 8)