diff --git a/cmd/puffs-c/internal/cgen/func.go b/cmd/puffs-c/internal/cgen/func.go index a21cf5d9..e30de0b4 100644 --- a/cmd/puffs-c/internal/cgen/func.go +++ b/cmd/puffs-c/internal/cgen/func.go @@ -31,7 +31,7 @@ type funk struct { astFunc *a.Func derivedVars map[t.ID]struct{} - jumpTargets map[*a.While]uint32 + jumpTargets map[a.Loop]uint32 coroSuspPoint uint32 tempW uint32 tempR uint32 @@ -42,9 +42,9 @@ type funk struct { shortReads []string } -func (k *funk) jumpTarget(n *a.While) (uint32, error) { +func (k *funk) jumpTarget(n a.Loop) (uint32, error) { if k.jumpTargets == nil { - k.jumpTargets = map[*a.While]uint32{} + k.jumpTargets = map[a.Loop]uint32{} } if jt, ok := k.jumpTargets[n]; ok { return jt, nil diff --git a/cmd/puffs-c/internal/cgen/statement.go b/cmd/puffs-c/internal/cgen/statement.go index a360b001..0f36bf79 100644 --- a/cmd/puffs-c/internal/cgen/statement.go +++ b/cmd/puffs-c/internal/cgen/statement.go @@ -258,6 +258,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { b.printf("uint8_t* %s%s = %sslice_%s.ptr;\n", vPrefix, name, iPrefix, name) b.printf("uint8_t* %send_%s = %sslice_%s.ptr + %sslice_%s.len;\n", iPrefix, name, iPrefix, name, iPrefix, name) + // TODO: look at n.HasContinue(). b.printf("while (%s%s < %send_%s) {\n", vPrefix, name, iPrefix, name) for _, o := range n.Body() { if err := g.writeStatement(b, o, depth); err != nil { @@ -265,6 +266,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { } } b.printf("%s%s++;\n}\n", vPrefix, name) + // TODO: look at n.HasBreak(). b.writes("}\n") return nil diff --git a/lang/ast/ast.go b/lang/ast/ast.go index 805d43c1..d3c3b3fa 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -104,7 +104,7 @@ type Node struct { constValue *big.Int mType *TypeExpr - jumpTarget *While + jumpTarget Loop filename string line uint32 @@ -167,6 +167,17 @@ func (n *Node) Walk(f func(*Node) error) error { return nil } +type Loop interface { + Node() *Node + HasBreak() bool + HasContinue() bool + Label() t.ID + Asserts() []*Node + Body() []*Node + SetHasBreak() + SetHasContinue() +} + type Raw Node func (n *Raw) Node() *Node { return (*Node)(n) } @@ -382,11 +393,12 @@ func NewField(name t.ID, xType *TypeExpr, defaultValue *Expr) *Field { } } -// Iterate is "iterate:ID1 (vars) { List2 }": +// Iterate is "iterate:ID1 (vars), List1 { List2 }": // - FlagsHasBreak is the iterate has an explicit break // - FlagsHasContinue is the iterate has an explicit continue // - ID1: <0|label> // - List0: variables +// - List1: asserts // - List2: loop body type Iterate Node @@ -395,16 +407,18 @@ func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 } func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 } func (n *Iterate) Label() t.ID { return n.id1 } 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, variables []*Node, body []*Node) *Iterate { +func NewIterate(label t.ID, variables []*Node, asserts []*Node, body []*Node) *Iterate { return &Iterate{ kind: KIterate, id1: label, list0: variables, + list1: asserts, list2: body, } } @@ -487,12 +501,12 @@ func NewReturn(keyword t.ID, message t.ID, value *Expr) *Return { // - ID1: <0|label> type Jump Node -func (n *Jump) Node() *Node { return (*Node)(n) } -func (n *Jump) JumpTarget() *While { return n.jumpTarget } -func (n *Jump) Keyword() t.ID { return n.id0 } -func (n *Jump) Label() t.ID { return n.id1 } +func (n *Jump) Node() *Node { return (*Node)(n) } +func (n *Jump) JumpTarget() Loop { return n.jumpTarget } +func (n *Jump) Keyword() t.ID { return n.id0 } +func (n *Jump) Label() t.ID { return n.id1 } -func (n *Jump) SetJumpTarget(o *While) { n.jumpTarget = o } +func (n *Jump) SetJumpTarget(o Loop) { n.jumpTarget = o } func NewJump(keyword t.ID, label t.ID) *Jump { return &Jump{ diff --git a/lang/check/check.go b/lang/check/check.go index a281f4e3..acbf8dac 100644 --- a/lang/check/check.go +++ b/lang/check/check.go @@ -586,7 +586,7 @@ type checker struct { errFilename string errLine uint32 - jumpTargets []*a.While + jumpTargets []a.Loop facts facts } diff --git a/lang/check/type.go b/lang/check/type.go index c171b3c8..eb3f3c26 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -112,7 +112,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { case a.KJump: n := n.Jump() - jumpTarget := (*a.While)(nil) + jumpTarget := (a.Loop)(nil) if id := n.Label(); id != 0 { for i := len(q.jumpTargets) - 1; i >= 0; i-- { if w := q.jumpTargets[i]; w.Label() == id { @@ -128,7 +128,7 @@ func (q *checker) tcheckStatement(n *a.Node) error { if id := n.Label(); id != 0 { sepStr, labelStr = ":", id.String(q.tm) } - return fmt.Errorf("no matching while statement for %s%s%s", + return fmt.Errorf("no matching while/iterate statement for %s%s%s", n.Keyword().String(q.tm), sepStr, labelStr) } if n.Keyword().Key() == t.KeyBreak { @@ -208,10 +208,8 @@ func (q *checker) tcheckStatement(n *a.Node) error { return err } } - for _, o := range n.Body() { - if err := q.tcheckStatement(o); err != nil { - return err - } + if err := q.tcheckLoop(n); err != nil { + return err } case a.KWhile: @@ -224,20 +222,8 @@ func (q *checker) tcheckStatement(n *a.Node) error { return fmt.Errorf("check: for-loop condition %q, of type %q, does not have a boolean type", cond.String(q.tm), cond.MType().String(q.tm)) } - for _, o := range n.Asserts() { - if err := q.tcheckAssert(o.Assert()); err != nil { - return err - } - o.SetTypeChecked() - } - q.jumpTargets = append(q.jumpTargets, n) - defer func() { - q.jumpTargets = q.jumpTargets[:len(q.jumpTargets)-1] - }() - for _, o := range n.Body() { - if err := q.tcheckStatement(o); err != nil { - return err - } + if err := q.tcheckLoop(n); err != nil { + return err } default: @@ -324,6 +310,25 @@ func (q *checker) tcheckArg(n *a.Arg, depth uint32) error { return nil } +func (q *checker) tcheckLoop(n a.Loop) error { + for _, o := range n.Asserts() { + if err := q.tcheckAssert(o.Assert()); err != nil { + return err + } + o.SetTypeChecked() + } + q.jumpTargets = append(q.jumpTargets, n) + defer func() { + q.jumpTargets = q.jumpTargets[:len(q.jumpTargets)-1] + }() + for _, o := range n.Body() { + if err := q.tcheckStatement(o); err != nil { + return err + } + } + return nil +} + func (q *checker) tcheckExpr(n *a.Expr, depth uint32) error { if depth > a.MaxExprDepth { return fmt.Errorf("check: expression recursion depth too large") diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 6f26a6dd..c195a6f5 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -578,11 +578,15 @@ func (p *parser) parseStatement1() (*a.Node, error) { if err != nil { return nil, err } + asserts, err := p.parseAsserts() + if err != nil { + return nil, err + } body, err := p.parseBlock() if err != nil { return nil, err } - return a.NewIterate(label, vars, body).Node(), nil + return a.NewIterate(label, vars, asserts, body).Node(), nil case t.KeyWhile: p.src = p.src[1:] @@ -594,16 +598,9 @@ func (p *parser) parseStatement1() (*a.Node, error) { if err != nil { return nil, err } - asserts := []*a.Node(nil) - if p.peek1().Key() == t.KeyComma { - p.src = p.src[1:] - asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode) - if err != nil { - return nil, err - } - if err := p.assertsSorted(asserts); err != nil { - return nil, err - } + asserts, err := p.parseAsserts() + if err != nil { + return nil, err } body, err := p.parseBlock() if err != nil { @@ -660,6 +657,21 @@ func (p *parser) parseStatement1() (*a.Node, error) { return lhs.Node(), nil } +func (p *parser) parseAsserts() ([]*a.Node, error) { + asserts := []*a.Node(nil) + if p.peek1().Key() == t.KeyComma { + p.src = p.src[1:] + var err error + if asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode); err != nil { + return nil, err + } + if err := p.assertsSorted(asserts); err != nil { + return nil, err + } + } + return asserts, nil +} + func (p *parser) parseIf() (*a.If, error) { if x := p.peek1().Key(); x != t.KeyIf { got := p.tm.ByKey(x)