diff --git a/lang/ast/ast.go b/lang/ast/ast.go index a1759627..e45f7718 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -283,8 +283,8 @@ func NewField(name t.ID, xType *TypeExpr) *Field { } } -// While is "while { List1 }" or "while LHS { List1 }": -// - LHS: +// While is "while LHS, List0 { List1 }": +// - LHS: // - List0: asserts // - List1: <*> loop body type While Node diff --git a/lang/check/type.go b/lang/check/type.go index acf50077..8167c4df 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -70,14 +70,13 @@ func (c *typeChecker) checkStatement(n *a.Node) error { case a.KWhile: o := n.While() - if cond := o.Condition(); cond != nil { - if err := c.checkExpr(cond); err != nil { - return err - } - if !cond.MType().Eq(TypeExprBoolean) { - return fmt.Errorf("check: for-loop condition %q, of type %q, does not have a boolean type", - cond.String(c.idMap), cond.MType().String(c.idMap)) - } + cond := o.Condition() + if err := c.checkExpr(cond); err != nil { + return err + } + if !cond.MType().Eq(TypeExprBoolean) { + return fmt.Errorf("check: for-loop condition %q, of type %q, does not have a boolean type", + cond.String(c.idMap), cond.MType().String(c.idMap)) } for _, m := range o.Asserts() { if err := c.checkAssert(m.Assert()); err != nil { @@ -146,6 +145,7 @@ func (c *typeChecker) checkAssert(n *a.Assert) error { return fmt.Errorf("check: assert condition %q, of type %q, does not have a boolean type", cond.String(c.idMap), cond.MType().String(c.idMap)) } + // TODO: check that there are no side effects. // TODO: check the actual assertion. return nil } diff --git a/lang/parse/parse.go b/lang/parse/parse.go index d03ec068..214878f8 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -413,20 +413,12 @@ func (p *parser) parseStatement1() (*a.Node, error) { case t.IDWhile: p.src = p.src[1:] - condition, asserts, err := (*a.Expr)(nil), []*a.Node(nil), error(nil) - switch p.peekID() { - case t.IDOpenCurly: - // No-op. - default: - condition, err = p.parseExpr() - if err != nil { - return nil, err - } - if p.peekID() != t.IDComma { - break - } - fallthrough - case t.IDComma: + condition, err := p.parseExpr() + if err != nil { + return nil, err + } + asserts := []*a.Node(nil) + if p.peekID() == t.IDComma { p.src = p.src[1:] asserts, err = p.parseList(t.IDOpenCurly, (*parser).parseAssertNode) if err != nil {