Move loop/jump matching from check to parse

This commit is contained in:
Nigel Tao committed 2020-04-03 10:26:35 +11:00
1 parent 94440cf6ff
commit ee23f8b3d9
4 files changed
+73 -50

No files matched your search

+21 -9
View File
@@ -255,6 +255,18 @@ type Loop interface {
SetHasContinue()
}
type LoopStack []Loop
func (s *LoopStack) Push(l Loop) {
*s = append(*s, l)
}
func (s *LoopStack) Pop() Loop {
l := (*s)[len(*s)-1]
*s = (*s)[:len(*s)-1]
return l
}
type Raw Node
func (n *Raw) AsNode() *Node { return (*Node)(n) }
@@ -532,19 +544,19 @@ func (n *Iterate) Assigns() []*Node { return n.list0 }
func (n *Iterate) Asserts() []*Node { return n.list1 }
func (n *Iterate) Body() []*Node { return n.list2 }
func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak }
func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue }
func (n *Iterate) SetBody(body []*Node) { n.list2 = body }
func (n *Iterate) SetElseIterate(o *Iterate) { n.rhs = o.AsNode() }
func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak }
func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue }
func NewIterate(label t.ID, assigns []*Node, length t.ID, unroll t.ID, asserts []*Node, body []*Node, elseIterate *Iterate) *Iterate {
func NewIterate(label t.ID, assigns []*Node, length t.ID, unroll t.ID, asserts []*Node) *Iterate {
return &Iterate{
kind: KIterate,
id0: unroll,
id1: label,
id2: length,
rhs: elseIterate.AsNode(),
list0: assigns,
list1: asserts,
list2: body,
}
}
@@ -568,16 +580,16 @@ func (n *While) Condition() *Expr { return n.mhs.AsExpr() }
func (n *While) Asserts() []*Node { return n.list1 }
func (n *While) Body() []*Node { return n.list2 }
func (n *While) SetHasBreak() { n.flags |= FlagsHasBreak }
func (n *While) SetHasContinue() { n.flags |= FlagsHasContinue }
func (n *While) SetBody(body []*Node) { n.list2 = body }
func (n *While) SetHasBreak() { n.flags |= FlagsHasBreak }
func (n *While) SetHasContinue() { n.flags |= FlagsHasContinue }
func NewWhile(label t.ID, condition *Expr, asserts []*Node, body []*Node) *While {
func NewWhile(label t.ID, condition *Expr, asserts []*Node) *While {
return &While{
kind: KWhile,
id1: label,
mhs: condition.AsNode(),
list1: asserts,
list2: body,
}
}
-2
View File
@@ -794,7 +794,5 @@ type checker struct {
errFilename string
errLine uint32
jumpTargets []a.Loop
facts facts
}
+1 -34
View File
@@ -140,36 +140,7 @@ func (q *checker) tcheckStatement(n *a.Node) error {
return nil
case a.KJump:
n := n.AsJump()
jumpTarget := (a.Loop)(nil)
if id := n.Label(); id != 0 {
for i := len(q.jumpTargets) - 1; i >= 0; i-- {
if w := q.jumpTargets[i]; w.Label() == id {
jumpTarget = w
break
}
}
} else if nj := len(q.jumpTargets); nj > 0 {
jumpTarget = q.jumpTargets[nj-1]
if jumpTarget.Label() != 0 {
return fmt.Errorf("check: unlabeled %s for labeled %s.%s",
n.Keyword().Str(q.tm), jumpTarget.Keyword().Str(q.tm), jumpTarget.Label().Str(q.tm))
}
}
if jumpTarget == nil {
sepStr, labelStr := "", ""
if id := n.Label(); id != 0 {
sepStr, labelStr = ":", id.Str(q.tm)
}
return fmt.Errorf("check: no matching while/iterate statement for %s%s%s",
n.Keyword().Str(q.tm), sepStr, labelStr)
}
if n.Keyword() == t.IDBreak {
jumpTarget.SetHasBreak()
} else {
jumpTarget.SetHasContinue()
}
n.SetJumpTarget(jumpTarget)
// No-op.
case a.KRet:
n := n.AsRet()
@@ -317,10 +288,6 @@ func (q *checker) tcheckLoop(n a.Loop) error {
}
setPlaceholderMBoundsMType(o)
}
q.jumpTargets = append(q.jumpTargets, n)
defer func() {
q.jumpTargets = q.jumpTargets[:len(q.jumpTargets)-1]
}()
for _, o := range n.Body() {
if err := q.tcheckStatement(o); err != nil {
return err
+51 -5
View File
@@ -77,6 +77,7 @@ type parser struct {
opts Options
lastLine uint32
funcEffect a.Effect
loops a.LoopStack
allowVar bool
}
@@ -704,7 +705,41 @@ func (p *parser) parseStatement1() (*a.Node, error) {
if err != nil {
return nil, err
}
return a.NewJump(x, label).AsNode(), nil
loop := a.Loop(nil)
if len(p.loops) == 0 {
// No-op.
} else if label == 0 {
loop = p.loops[len(p.loops)-1]
if loop.Label() != 0 {
return nil, fmt.Errorf(`parse: unlabeled %s for labeled %s.%s at %s:%d`,
x.Str(p.tm), loop.Keyword().Str(p.tm), loop.Label().Str(p.tm), p.filename, p.line())
}
} else {
for i := len(p.loops) - 1; i >= 0; i-- {
if l := p.loops[i]; label == l.Label() {
loop = l
break
}
}
}
if loop == nil {
sepStr, labelStr := "", ""
if label != 0 {
sepStr, labelStr = ".", label.Str(p.tm)
}
return nil, fmt.Errorf(`parse: no matching while/iterate statement for %s%s%s at %s:%d`,
x.Str(p.tm), sepStr, labelStr, p.filename, p.line())
}
if x == t.IDBreak {
loop.SetHasBreak()
} else {
loop.SetHasContinue()
}
n := a.NewJump(x, label)
n.SetJumpTarget(loop)
return n.AsNode(), nil
case t.IDIOBind, t.IDIOLimit:
return p.parseIOBindNode()
@@ -760,10 +795,16 @@ func (p *parser) parseStatement1() (*a.Node, error) {
return nil, fmt.Errorf(`parse: double {{ }} while loop condition isn't "true" at %s:%d`,
p.filename, p.line())
}
n := a.NewWhile(label, condition, asserts)
p.loops.Push(n)
body, err := p.parseBlock(doubleCurly)
if err != nil {
return nil, err
}
n.SetBody(body)
p.loops.Pop()
if !p.parseEndwhile(label) {
dotLabel := ""
if label != 0 {
@@ -776,7 +817,7 @@ func (p *parser) parseStatement1() (*a.Node, error) {
return nil, fmt.Errorf(`parse: double {{ }} while loop doesn't terminate at %s:%d`,
p.filename, p.line())
}
return a.NewWhile(label, condition, asserts, body).AsNode(), nil
return n.AsNode(), nil
}
return p.parseAssignNode()
}
@@ -1071,21 +1112,26 @@ func (p *parser) parseIterateBlock(label t.ID, assigns []*a.Node) (*a.Iterate, e
if err != nil {
return nil, err
}
n := a.NewIterate(label, assigns, length, unroll, asserts)
// TODO: decide how break/continue work with iterate loops.
p.loops.Push(n)
body, err := p.parseBlock(false)
if err != nil {
return nil, err
}
n.SetBody(body)
p.loops.Pop()
elseIterate := (*a.Iterate)(nil)
if x := p.peek1(); x == t.IDElse {
p.src = p.src[1:]
elseIterate, err = p.parseIterateBlock(0, nil)
elseIterate, err := p.parseIterateBlock(0, nil)
if err != nil {
return nil, err
}
n.SetElseIterate(elseIterate)
}
return a.NewIterate(label, assigns, length, unroll, asserts, body, elseIterate), nil
return n, nil
}
func (p *parser) parseArgNode() (*a.Node, error) {