Place iterate params after vars, not before

This commit is contained in:
Nigel Tao committed 2018-05-10 09:38:14 +10:00
1 parent 79aded4797
commit 282b9c4b20
4 files changed
+12 -12

No files matched your search

+5 -5
View File
@@ -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: <Var> variables
// - List0: <Var> vars
// - List1: <Assert> asserts
// - List2: <Statement> body
// - List3: <Statement> 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: <Expr>
// - RHS: <nil|If>
// - List2: <Statement> if-true body
+5 -5
View File
@@ -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) {
+1 -1
View File
@@ -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
}
+1 -1
View File
@@ -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) |