mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-21 00:47:28 +01:00
Move loop/jump matching from check to parse
This commit is contained in:
1 parent
94440cf6ff
commit
ee23f8b3d9
4 files changed
+73
-50
No files matched your search
@@ -794,7 +794,5 @@ type checker struct {
|
||||
errFilename string
|
||||
errLine uint32
|
||||
|
||||
jumpTargets []a.Loop
|
||||
|
||||
facts facts
|
||||
}
|
||||
+1
-34
@@ -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
|
||||
|
||||
Reference in new issue
Block a user