Rename cgen's break/continue labels

This commit is contained in:
Nigel Tao committed 2020-02-24 14:26:52 +11:00
1 parent 2d2a880c18
commit e6f34fe8a9
3 files changed
+188 -185

No files matched your search

+4 -1
View File
@@ -47,7 +47,10 @@ type funk struct {
hasGotoOK bool
}
func (k *funk) jumpTarget(n a.Loop) (uint32, error) {
func (k *funk) jumpTarget(tm *t.Map, n a.Loop) (interface{}, error) {
if label := n.Label(); label != 0 {
return label.Str(tm), nil
}
if k.jumpTargets == nil {
k.jumpTargets = map[a.Loop]uint32{}
}
+6 -6
View File
@@ -417,7 +417,7 @@ func (g *gen) writeStatementIterate(b *buffer, n *a.Iterate, depth uint32) error
}
func (g *gen) writeStatementJump(b *buffer, n *a.Jump, depth uint32) error {
jt, err := g.currFunk.jumpTarget(n.JumpTarget())
jt, err := g.currFunk.jumpTarget(g.tm, n.JumpTarget())
if err != nil {
return err
}
@@ -425,7 +425,7 @@ func (g *gen) writeStatementJump(b *buffer, n *a.Jump, depth uint32) error {
if n.Keyword() == t.IDBreak {
keyword = "break"
}
b.printf("goto label_%d_%s;\n", jt, keyword)
b.printf("goto label__%v__%s;\n", jt, keyword)
return nil
}
@@ -492,11 +492,11 @@ func (g *gen) writeStatementRet(b *buffer, n *a.Ret, depth uint32) error {
func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error {
if n.HasContinue() {
jt, err := g.currFunk.jumpTarget(n)
jt, err := g.currFunk.jumpTarget(g.tm, n)
if err != nil {
return err
}
b.printf("label_%d_continue:;\n", jt)
b.printf("label__%v__continue:;\n", jt)
}
condition := buffer(nil)
if err := g.writeExpr(&condition, n.Condition(), 0); err != nil {
@@ -511,11 +511,11 @@ func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error {
}
b.writes("}\n")
if n.HasBreak() {
jt, err := g.currFunk.jumpTarget(n)
jt, err := g.currFunk.jumpTarget(g.tm, n)
if err != nil {
return err
}
b.printf("label_%d_break:;\n", jt)
b.printf("label__%v__break:;\n", jt)
}
return nil
}