From a8423cee70cf3baaf485bd5ee816f5ae2cde8070 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sat, 26 Aug 2017 17:16:23 +1000 Subject: [PATCH] Refactor the jumpTarget method. --- cmd/puffs-c/internal/cgen/cgen.go | 15 --------------- cmd/puffs-c/internal/cgen/func.go | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/puffs-c/internal/cgen/cgen.go b/cmd/puffs-c/internal/cgen/cgen.go index 2f567602..37d9cbf8 100644 --- a/cmd/puffs-c/internal/cgen/cgen.go +++ b/cmd/puffs-c/internal/cgen/cgen.go @@ -170,21 +170,6 @@ type gen struct { funks map[t.QID]funk } -func (k *funk) jumpTarget(n *a.While) (uint32, error) { - if k.jumpTargets == nil { - k.jumpTargets = map[*a.While]uint32{} - } - 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") - } - k.jumpTargets[n] = jt - return jt, nil -} - func (g *gen) generate() ([]byte, error) { b := new(buffer) diff --git a/cmd/puffs-c/internal/cgen/func.go b/cmd/puffs-c/internal/cgen/func.go index 3cb8b5ea..10285ef4 100644 --- a/cmd/puffs-c/internal/cgen/func.go +++ b/cmd/puffs-c/internal/cgen/func.go @@ -31,6 +31,21 @@ type funk struct { shortReads []string } +func (k *funk) jumpTarget(n *a.While) (uint32, error) { + if k.jumpTargets == nil { + k.jumpTargets = map[*a.While]uint32{} + } + 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") + } + k.jumpTargets[n] = jt + return jt, nil +} + func (g *gen) writeFuncSignature(b *buffer, n *a.Func) error { // TODO: write n's return values. if n.Suspendible() {