Reorder some switch cases.

This commit is contained in:
Nigel Tao committed 2017-10-22 14:01:26 +11:00
1 parent ac793d33bc
commit 83c8faef4d
3 files changed
+96 -96

No files matched your search

+18 -18
View File
@@ -122,6 +122,24 @@ func (q *checker) tcheckStatement(n *a.Node) error {
}
return nil
case a.KIterate:
n := n.Iterate()
unroll := n.UnrollCount()
if err := q.tcheckExpr(unroll, 0); err != nil {
return err
}
if cv := unroll.ConstValue(); cv == nil {
return fmt.Errorf("check: unroll count %q is not constant", unroll.String(q.tm))
}
for _, o := range n.Variables() {
if err := q.tcheckStatement(o); err != nil {
return err
}
}
if err := q.tcheckLoop(n); err != nil {
return err
}
case a.KJump:
n := n.Jump()
jumpTarget := (a.Loop)(nil)
@@ -213,24 +231,6 @@ func (q *checker) tcheckStatement(n *a.Node) error {
// TODO: check that the default zero value is assignable to n.XType().
}
case a.KIterate:
n := n.Iterate()
unroll := n.UnrollCount()
if err := q.tcheckExpr(unroll, 0); err != nil {
return err
}
if cv := unroll.ConstValue(); cv == nil {
return fmt.Errorf("check: unroll count %q is not constant", unroll.String(q.tm))
}
for _, o := range n.Variables() {
if err := q.tcheckStatement(o); err != nil {
return err
}
}
if err := q.tcheckLoop(n); err != nil {
return err
}
case a.KWhile:
n := n.While()
cond := n.Condition()
+24 -24
View File
@@ -568,6 +568,10 @@ func (p *parser) parseStatement1() (*a.Node, error) {
}
return a.NewJump(x, label).Node(), nil
case t.KeyIf:
o, err := p.parseIf()
return o.Node(), err
case t.KeyIterate:
p.src = p.src[1:]
if x := p.peek1().Key(); x != t.KeyDot {
@@ -608,30 +612,6 @@ func (p *parser) parseStatement1() (*a.Node, error) {
}
return a.NewIterate(label, unroll, vars, asserts, body).Node(), nil
case t.KeyWhile:
p.src = p.src[1:]
label, err := p.parseLabel()
if err != nil {
return nil, err
}
condition, err := p.parseExpr()
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.NewWhile(label, condition, asserts, body).Node(), nil
case t.KeyIf:
o, err := p.parseIf()
return o.Node(), err
case t.KeyMark:
p.src = p.src[1:]
value, err := p.parseExpr()
@@ -666,6 +646,26 @@ func (p *parser) parseStatement1() (*a.Node, error) {
case t.KeyVar:
p.src = p.src[1:]
return p.parseVar(false)
case t.KeyWhile:
p.src = p.src[1:]
label, err := p.parseLabel()
if err != nil {
return nil, err
}
condition, err := p.parseExpr()
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.NewWhile(label, condition, asserts, body).Node(), nil
}
lhs, err := p.parseExpr()