diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index 3923e750..9d34c0a5 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -214,25 +214,7 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error { } func (g *gen) writeStatementIf(b *buffer, n *a.If, depth uint32) error { - // TODO: for writeSuspendibles, make sure that we get order of - // sub-expression evaluation correct. - nCloseCurly := 1 - for first := true; ; first = false { - // TODO: restrict the if condition to effect-free expressions? - if n.Condition().Effect().Coroutine() { - if !first { - b.writeb('{') - const maxCloseCurly = 1000 - if nCloseCurly == maxCloseCurly { - return fmt.Errorf("too many nested if's") - } - nCloseCurly++ - } - if err := g.writeSuspendibles(b, n.Condition(), depth); err != nil { - return err - } - } - + for { condition := buffer(nil) if err := g.writeExpr(&condition, n.Condition(), replaceCallSuspendibles, 0); err != nil { return err @@ -259,9 +241,7 @@ func (g *gen) writeStatementIf(b *buffer, n *a.If, depth uint32) error { } b.writes("} else ") } - for ; nCloseCurly > 0; nCloseCurly-- { - b.writes("}\n") - } + b.writes("}\n") return nil } @@ -419,8 +399,6 @@ func (g *gen) writeStatementVar(b *buffer, n *a.Var, depth uint32) error { } func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error { - // TODO: consider suspendible calls. - if n.HasContinue() { jt, err := g.currFunk.jumpTarget(n) if err != nil { diff --git a/lang/check/bounds.go b/lang/check/bounds.go index ddfb337b..2179a89d 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -525,8 +525,6 @@ func (q *checker) bcheckIf(n *a.If) error { for n != nil { snap := snapshot(q.facts) // Check the if condition. - // - // TODO: check that n.Condition() has no side effects. if _, err := q.bcheckExpr(n.Condition(), 0); err != nil { return err } @@ -581,8 +579,6 @@ func (q *checker) bcheckWhile(n *a.While) error { } // Check the while condition. - // - // TODO: check that n.Condition() has no side effects. if _, err := q.bcheckExpr(n.Condition(), 0); err != nil { return err } diff --git a/lang/check/type.go b/lang/check/type.go index 62810497..f443f028 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -94,6 +94,9 @@ func (q *checker) tcheckStatement(n *a.Node) error { case a.KIf: for n := n.AsIf(); n != nil; n = n.ElseIf() { cond := n.Condition() + if cond.Effect() != 0 { + return fmt.Errorf("check: internal error: if-condition is not effect-free") + } if err := q.tcheckExpr(cond, 0); err != nil { return err } @@ -224,6 +227,9 @@ func (q *checker) tcheckStatement(n *a.Node) error { case a.KWhile: n := n.AsWhile() cond := n.Condition() + if cond.Effect() != 0 { + return fmt.Errorf("check: internal error: while-condition is not effect-free") + } if err := q.tcheckExpr(cond, 0); err != nil { return err } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 9f1e1fa9..9a145a4b 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -656,6 +656,10 @@ func (p *parser) parseStatement1() (*a.Node, error) { if err != nil { return nil, err } + if condition.Effect() != 0 { + return nil, fmt.Errorf(`parse: while-condition %q is not effect-free at %s:%d`, + condition.Str(p.tm), p.filename, p.line()) + } asserts, err := p.parseAsserts() if err != nil { return nil, err @@ -709,6 +713,10 @@ func (p *parser) parseIf() (*a.If, error) { if err != nil { return nil, err } + if condition.Effect() != 0 { + return nil, fmt.Errorf(`parse: if-condition %q is not effect-free at %s:%d`, + condition.Str(p.tm), p.filename, p.line()) + } bodyIfTrue, err := p.parseBlock() if err != nil { return nil, err