cmd/compile: move lexn and lexname into lex.go (cleanup)

Missed these two declarations in the previous cleanup.

Change-Id: I54ff3accd387dd90e12847daccf4477169797f81
Reviewed-on: https://go-review.googlesource.com/20603
Run-TryBot: Robert Griesemer <gri@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/cmd/compile/internal/gc/lex.go b/src/cmd/compile/internal/gc/lex.go
index 23eb97a5e3cf14adbdecdfa9b208f20aa29cf5ff..e95cb6f75c2e89a8e03e33d2a22ec6957e2e4f94 100644 (file)
--- a/src/cmd/compile/internal/gc/lex.go
+++ b/src/cmd/compile/internal/gc/lex.go
@@ -137,6 +137,54 @@ const (
        LIGNORE
 )
 
+var lexn = map[rune]string{
+       LNAME:    "NAME",
+       LLITERAL: "LITERAL",
+
+       LOPER:  "OPER",
+       LASOP:  "ASOP",
+       LINCOP: "INCOP",
+
+       LCOLAS: "COLAS",
+       LCOMM:  "COMM",
+       LDDD:   "DDD",
+
+       LBREAK:     "BREAK",
+       LCASE:      "CASE",
+       LCHAN:      "CHAN",
+       LCONST:     "CONST",
+       LCONTINUE:  "CONTINUE",
+       LDEFAULT:   "DEFAULT",
+       LDEFER:     "DEFER",
+       LELSE:      "ELSE",
+       LFALL:      "FALL",
+       LFOR:       "FOR",
+       LFUNC:      "FUNC",
+       LGO:        "GO",
+       LGOTO:      "GOTO",
+       LIF:        "IF",
+       LIMPORT:    "IMPORT",
+       LINTERFACE: "INTERFACE",
+       LMAP:       "MAP",
+       LPACKAGE:   "PACKAGE",
+       LRANGE:     "RANGE",
+       LRETURN:    "RETURN",
+       LSELECT:    "SELECT",
+       LSTRUCT:    "STRUCT",
+       LSWITCH:    "SWITCH",
+       LTYPE:      "TYPE",
+       LVAR:       "VAR",
+
+       // LIGNORE is never escaping lexer.next
+}
+
+func lexname(lex rune) string {
+       if s, ok := lexn[lex]; ok {
+               return s
+       }
+       return fmt.Sprintf("LEX-%d", lex)
+}
+
 func (l *lexer) next() {
        nlsemi := l.nlsemi
        l.nlsemi = false

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index fb6a940864ba37d92efbf176c332fa9dd94b7e93..47531f5ff49800fa88346e71112be3569ab3bf1e 100644 (file)
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -1057,52 +1057,6 @@ func lexfini() {
        nodfp.Sym = Lookup(".fp")
 }
 
-var lexn = map[rune]string{
-       LNAME:    "NAME",
-       LLITERAL: "LITERAL",
-
-       LOPER:  "OPER",
-       LASOP:  "ASOP",
-       LINCOP: "INCOP",
-
-       LCOLAS: "COLAS",
-       LCOMM:  "COMM",
-       LDDD:   "DDD",
-
-       LBREAK:     "BREAK",
-       LCASE:      "CASE",
-       LCHAN:      "CHAN",
-       LCONST:     "CONST",
-       LCONTINUE:  "CONTINUE",
-       LDEFAULT:   "DEFAULT",
-       LDEFER:     "DEFER",
-       LELSE:      "ELSE",
-       LFALL:      "FALL",
-       LFOR:       "FOR",
-       LFUNC:      "FUNC",
-       LGO:        "GO",
-       LGOTO:      "GOTO",
-       LIF:        "IF",
-       LIMPORT:    "IMPORT",
-       LINTERFACE: "INTERFACE",
-       LMAP:       "MAP",
-       LPACKAGE:   "PACKAGE",
-       LRANGE:     "RANGE",
-       LRETURN:    "RETURN",
-       LSELECT:    "SELECT",
-       LSTRUCT:    "STRUCT",
-       LSWITCH:    "SWITCH",
-       LTYPE:      "TYPE",
-       LVAR:       "VAR",
-}
-
-func lexname(lex rune) string {
-       if s, ok := lexn[lex]; ok {
-               return s
-       }
-       return fmt.Sprintf("LEX-%d", lex)
-}
-
 func pkgnotused(lineno int32, path string, name string) {
        // If the package was imported with a name other than the final
        // import path element, show it explicitly in the error message.