From 75b67f833e59953244f9c58f358c57b32d9b8c42 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Thu, 4 Sep 2014 16:18:38 -0700 Subject: [PATCH] go.tools/cmd/stringer: fix generated map code Missed comment from previous code review. Next up: execution tests so this won't happen again LGTM=gri R=gri CC=golang-codereviews https://golang.org/cl/134480043 --- cmd/stringer/golden_test.go | 26 +++++++++++++------------- cmd/stringer/stringer.go | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cmd/stringer/golden_test.go b/cmd/stringer/golden_test.go index b268817c..284de4bf 100644 --- a/cmd/stringer/golden_test.go +++ b/cmd/stringer/golden_test.go @@ -232,19 +232,19 @@ const map_out = ` const _Prime_name = "p2p3p5p7p11p13p17p19p23p29p37p41p43" var _Prime_map = map[Prime]string{ - 2: _Prime_map[0:2], - 3: _Prime_map[2:4], - 5: _Prime_map[4:6], - 7: _Prime_map[6:8], - 11: _Prime_map[8:11], - 13: _Prime_map[11:14], - 17: _Prime_map[14:17], - 19: _Prime_map[17:20], - 23: _Prime_map[20:23], - 29: _Prime_map[23:26], - 31: _Prime_map[26:29], - 41: _Prime_map[29:32], - 43: _Prime_map[32:35], + 2: _Prime_name[0:2], + 3: _Prime_name[2:4], + 5: _Prime_name[4:6], + 7: _Prime_name[6:8], + 11: _Prime_name[8:11], + 13: _Prime_name[11:14], + 17: _Prime_name[14:17], + 19: _Prime_name[17:20], + 23: _Prime_name[20:23], + 29: _Prime_name[23:26], + 31: _Prime_name[26:29], + 41: _Prime_name[29:32], + 43: _Prime_name[32:35], } func (i Prime) String() string { diff --git a/cmd/stringer/stringer.go b/cmd/stringer/stringer.go index 44974318..3bc5000d 100644 --- a/cmd/stringer/stringer.go +++ b/cmd/stringer/stringer.go @@ -634,7 +634,7 @@ func (g *Generator) buildMap(runs [][]Value, typeName string) { n := 0 for _, values := range runs { for _, value := range values { - g.Printf("\t%s: _%s_map[%d:%d],\n", &value, typeName, n, n+len(value.name)) + g.Printf("\t%s: _%s_name[%d:%d],\n", &value, typeName, n, n+len(value.name)) n += len(value.name) } }