From 16867779be2d928b0b6302e25cd39705038c2eee Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 1 Mar 2020 12:01:59 +1100 Subject: [PATCH] Tighten cgen's funk.jumpTarget return type --- internal/cgen/func.go | 14 ++++++++------ internal/cgen/statement.go | 6 +++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/internal/cgen/func.go b/internal/cgen/func.go index e5f448f8..13df2ca0 100644 --- a/internal/cgen/func.go +++ b/internal/cgen/func.go @@ -17,6 +17,7 @@ package cgen import ( "fmt" "math/big" + "strconv" a "github.com/google/wuffs/lang/ast" t "github.com/google/wuffs/lang/token" @@ -37,7 +38,7 @@ type funk struct { varList []*a.Var varResumables map[t.ID]bool derivedVars map[t.ID]struct{} - jumpTargets map[a.Loop]uint32 + jumpTargets map[a.Loop]string coroSuspPoint uint32 ioBinds uint32 tempW uint32 @@ -47,20 +48,21 @@ type funk struct { hasGotoOK bool } -func (k *funk) jumpTarget(tm *t.Map, n a.Loop) (interface{}, error) { +func (k *funk) jumpTarget(tm *t.Map, n a.Loop) (string, error) { if label := n.Label(); label != 0 { return label.Str(tm), nil } if k.jumpTargets == nil { - k.jumpTargets = map[a.Loop]uint32{} + k.jumpTargets = map[a.Loop]string{} } if jt, ok := k.jumpTargets[n]; ok { return jt, nil } - jt := uint32(len(k.jumpTargets)) - if jt == 1000000 { - return 0, fmt.Errorf("too many jump targets") + jtInt := len(k.jumpTargets) + if jtInt == 1000000 { + return "", fmt.Errorf("too many jump targets") } + jt := strconv.Itoa(jtInt) k.jumpTargets[n] = jt return jt, nil } diff --git a/internal/cgen/statement.go b/internal/cgen/statement.go index a39475ad..b141b644 100644 --- a/internal/cgen/statement.go +++ b/internal/cgen/statement.go @@ -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__%v__%s;\n", jt, keyword) + b.printf("goto label__%s__%s;\n", jt, keyword) return nil } @@ -496,7 +496,7 @@ func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error { if err != nil { return err } - b.printf("label__%v__continue:;\n", jt) + b.printf("label__%s__continue:;\n", jt) } condition := buffer(nil) if err := g.writeExpr(&condition, n.Condition(), 0); err != nil { @@ -515,7 +515,7 @@ func (g *gen) writeStatementWhile(b *buffer, n *a.While, depth uint32) error { if err != nil { return err } - b.printf("label__%v__break:;\n", jt) + b.printf("label__%s__break:;\n", jt) } return nil }