diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 6061c928..81bbef71 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -263,23 +263,20 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error b.printf("wuffs_base__slice_u8 %s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name) // TODO: look at n.HasContinue() and n.HasBreak(). - block := n.Body() - length := n.Length().SmallPowerOf2Value() - unroll := n.Unroll().SmallPowerOf2Value() - if unroll > 1 || length > 1 { - if err := g.writeIterateRound(b, name, block, 0, depth, length, unroll); err != nil { - return err - } - } - if unroll > 1 { - if err := g.writeIterateRound(b, name, block, 1, depth, length, 1); err != nil { - return err - } - } - if length > 1 { - block = n.Tail() - if err := g.writeIterateRound(b, name, block, 2, depth, 1, 1); err != nil { - return err + round := uint32(0) + for ; n != nil; n = n.ElseIterate() { + length := n.Length().SmallPowerOf2Value() + unroll := n.Unroll().SmallPowerOf2Value() + for { + if err := g.writeIterateRound(b, name, n.Body(), round, depth, length, unroll); err != nil { + return err + } + round++ + + if unroll == 1 { + break + } + unroll = 1 } } @@ -416,13 +413,13 @@ func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error { return nil } -func (g *gen) writeIterateRound(b *buffer, name string, block []*a.Node, round uint32, depth uint32, length int, unroll int) error { +func (g *gen) writeIterateRound(b *buffer, name string, body []*a.Node, round uint32, depth uint32, length int, unroll int) error { b.printf("%s%s.len = %d;\n", vPrefix, name, length) b.printf("uint8_t* %send%d_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n", iPrefix, round, name, iPrefix, name, iPrefix, name, length*unroll, length*unroll) b.printf("while (%s%s.ptr < %send%d_%s) {\n", vPrefix, name, iPrefix, round, name) for i := 0; i < unroll; i++ { - for _, o := range block { + for _, o := range body { if err := g.writeStatement(b, o, depth); err != nil { return err } diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 28f810a3..72eb9554 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -248,11 +248,6 @@ type Loop interface { SetHasContinue() } -type TailedLoop interface { - Loop - Tail() []*Node -} - type Raw Node func (n *Raw) Node() *Node { return (*Node)(n) } @@ -516,42 +511,42 @@ func NewIOBind(in_fields []*Node, body []*Node) *IOBind { } // Iterate is -// "iterate:ID1 (vars)(length:ID2, unroll:ID0), List1 { List2 } else { List3 }": +// "iterate:ID1 (vars)(length:ID2, unroll:ID0), List1 { List2 } else RHS": // - FlagsHasBreak is the iterate has an explicit break // - FlagsHasContinue is the iterate has an explicit continue // - ID0: unroll // - ID1: <0|label> // - ID2: length +// - RHS: // - List0: vars // - List1: asserts // - List2: body -// - List3: tail type Iterate Node -func (n *Iterate) Node() *Node { return (*Node)(n) } -func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 } -func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 } -func (n *Iterate) Unroll() t.ID { return n.id0 } -func (n *Iterate) Label() t.ID { return n.id1 } -func (n *Iterate) Length() t.ID { return n.id2 } -func (n *Iterate) Variables() []*Node { return n.list0 } -func (n *Iterate) Asserts() []*Node { return n.list1 } -func (n *Iterate) Body() []*Node { return n.list2 } -func (n *Iterate) Tail() []*Node { return n.list3 } +func (n *Iterate) Node() *Node { return (*Node)(n) } +func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 } +func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 } +func (n *Iterate) Unroll() t.ID { return n.id0 } +func (n *Iterate) Label() t.ID { return n.id1 } +func (n *Iterate) Length() t.ID { return n.id2 } +func (n *Iterate) ElseIterate() *Iterate { return n.rhs.Iterate() } +func (n *Iterate) Variables() []*Node { return n.list0 } +func (n *Iterate) Asserts() []*Node { return n.list1 } +func (n *Iterate) Body() []*Node { return n.list2 } func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak } func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue } -func NewIterate(label t.ID, vars []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, tail []*Node) *Iterate { +func NewIterate(label t.ID, vars []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, elseIterate *Iterate) *Iterate { return &Iterate{ kind: KIterate, id0: unroll, id1: label, id2: length, + rhs: elseIterate.Node(), list0: vars, list1: asserts, list2: body, - list3: tail, } } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index fbf5bc54..830ecaf7 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -299,10 +299,10 @@ func (q *checker) bcheckStatement(n *a.Node) error { // execute-exactly-once block. We should have pre / inv / post // conditions, a la bcheckWhile. - // Check the body. - { + variables := n.Variables() + for ; n != nil; n = n.ElseIterate() { q.facts = q.facts[:0] - for _, o := range n.Variables() { + for _, o := range variables { v := o.Var() q.facts = append(q.facts, makeSliceLengthEqEq(v.Name(), v.XType(), n.Length())) } @@ -313,20 +313,6 @@ func (q *checker) bcheckStatement(n *a.Node) error { } } - // Check the tail. - { - q.facts = q.facts[:0] - for _, o := range n.Variables() { - v := o.Var() - q.facts = append(q.facts, makeSliceLengthEqEq(v.Name(), v.XType(), t.ID1)) - } - for _, o := range n.Tail() { - if err := q.bcheckStatement(o); err != nil { - return err - } - } - } - q.facts = q.facts[:0] return nil diff --git a/lang/check/type.go b/lang/check/type.go index cc501c57..0c821d94 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -45,14 +45,13 @@ func (q *checker) tcheckVars(block []*a.Node) error { } case a.KIterate: - if err := q.tcheckVars(o.Iterate().Variables()); err != nil { - return err - } - if err := q.tcheckVars(o.Iterate().Body()); err != nil { - return err - } - if err := q.tcheckVars(o.Iterate().Tail()); err != nil { - return err + for o := o.Iterate(); o != nil; o = o.ElseIterate() { + if err := q.tcheckVars(o.Variables()); err != nil { + return err + } + if err := q.tcheckVars(o.Body()); err != nil { + return err + } } case a.KVar: @@ -144,17 +143,22 @@ func (q *checker) tcheckStatement(n *a.Node) error { } case a.KIterate: - n := n.Iterate() - for _, o := range n.Variables() { - if err := q.tcheckStatement(o); err != nil { + for n := n.Iterate(); n != nil; n = n.ElseIterate() { + for _, o := range n.Variables() { + if err := q.tcheckStatement(o); err != nil { + return err + } + } + // TODO: prohibit jumps (breaks, continues), rets (returns, yields) and + // retry-calling ? methods while inside an iterate body. + if err := q.tcheckLoop(n); err != nil { return err } } - // TODO: prohibit jumps (breaks, continues), rets (returns, yields) and - // retry-calling ? methods while inside an iterate body. - if err := q.tcheckLoop(n); err != nil { - return err + for n := n.Iterate(); n != nil; n = n.ElseIterate() { + n.Node().SetTypeChecked() } + return nil case a.KJump: n := n.Jump() @@ -364,13 +368,6 @@ func (q *checker) tcheckLoop(n a.Loop) error { return err } } - if n, ok := n.(a.TailedLoop); ok { - for _, o := range n.Tail() { - if err := q.tcheckStatement(o); err != nil { - return err - } - } - } return nil } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 7319b795..d6f00d6c 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -727,7 +727,7 @@ func (p *parser) parseIf() (*a.If, error) { func (p *parser) parseIterateNode() (*a.Node, error) { if x := p.peek1(); x != t.IDIterate { got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "if", got %q at %s:%d`, got, p.filename, p.line()) + return nil, fmt.Errorf(`parse: expected "iterate", got %q at %s:%d`, got, p.filename, p.line()) } p.src = p.src[1:] label, err := p.parseLabel() @@ -738,7 +738,14 @@ func (p *parser) parseIterateNode() (*a.Node, error) { if err != nil { return nil, err } + n, err := p.parseIterateBlock(label, vars) + if err != nil { + return nil, err + } + return n.Node(), nil +} +func (p *parser) parseIterateBlock(label t.ID, vars []*a.Node) (*a.Iterate, error) { 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()) @@ -804,25 +811,16 @@ func (p *parser) parseIterateNode() (*a.Node, error) { return nil, err } - tail := ([]*a.Node)(nil) - if length == t.ID1 { - if x := p.peek1(); x == t.IDElse { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected non-"else", got %q at %s:%d`, got, p.filename, p.line()) - } - } else { - if x := p.peek1(); x != t.IDElse { - got := p.tm.ByID(x) - return nil, fmt.Errorf(`parse: expected "else", got %q at %s:%d`, got, p.filename, p.line()) - } + elseIterate := (*a.Iterate)(nil) + if x := p.peek1(); x == t.IDElse { p.src = p.src[1:] - tail, err = p.parseBlock() + elseIterate, err = p.parseIterateBlock(0, nil) if err != nil { return nil, err } } - return a.NewIterate(label, vars, length, unroll, asserts, body, tail).Node(), nil + return a.NewIterate(label, vars, length, unroll, asserts, body, elseIterate), nil } func (p *parser) parseArgNode() (*a.Node, error) { diff --git a/std/crc32/common_crc32.wuffs b/std/crc32/common_crc32.wuffs index 61d53e68..2af5d453 100644 --- a/std/crc32/common_crc32.wuffs +++ b/std/crc32/common_crc32.wuffs @@ -41,7 +41,7 @@ pub func ieee_hasher.update(x slice base.u8)(checksum base.u32) { ieee_table[5][0xFF & (s >> 16)] ^ ieee_table[6][0xFF & (s >> 8)] ^ ieee_table[7][0xFF & (s >> 0)] - } else { + } else (length:1, unroll:1) { s = ieee_table[0][((s & 0xFF) as base.u8) ^ p[0]] ^ (s >> 8) }