From e61b42f256f635d923789788a9585feb7b622f24 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 14 May 2017 14:25:07 +1000 Subject: [PATCH] Ensure contracts are sorted: pre, assert, post. --- lang/parse/parse.go | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lang/parse/parse.go b/lang/parse/parse.go index d0e2ed36..de692357 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -106,6 +106,9 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { if err != nil { return nil, err } + if err := p.assertsSorted(asserts); err != nil { + return nil, err + } } body, err := p.parseBlock() if err != nil { @@ -373,6 +376,31 @@ func (p *parser) parseBlock() ([]*a.Node, error) { return nil, fmt.Errorf("parse: expected \"}\" at %s:%d", p.filename, p.line()) } +func (p *parser) assertsSorted(asserts []*a.Node) error { + seenAssert, seenPost := false, false + for _, a := range asserts { + switch a.Assert().Keyword() { + case t.IDPre: + if seenPost || seenAssert { + break + } + continue + case t.IDAssert: + if seenPost { + break + } + seenAssert = true + continue + default: + seenPost = true + continue + } + return fmt.Errorf(`parse: assertion chain not in "pre", "assert", "post" order at %s:%d`, + p.filename, p.line()) + } + return nil +} + func (p *parser) parseAssertNode() (*a.Node, error) { switch x := p.peekID(); x { case t.IDAssert, t.IDPre, t.IDPost: @@ -420,6 +448,9 @@ func (p *parser) parseStatement1() (*a.Node, error) { if err != nil { return nil, err } + if err := p.assertsSorted(asserts); err != nil { + return nil, err + } } body, err := p.parseBlock() if err != nil {