mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Ensure contracts are sorted: pre, assert, post.
This commit is contained in:
1 parent
d9fc8a1114
commit
e61b42f256
1 file changed
+31
@@ -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 {
|
||||
|
||||
Reference in new issue
Block a user