goyacc: Fix debug printing of the lexed token's ID and name, and add whitespace in...

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/13352048

diff --git a/src/cmd/yacc/yacc.go b/src/cmd/yacc/yacc.go
index 7bc226699b2065e694cb6f6420a014a9688ba2ff..bb406f5743abbea2d9b787bdce9a0a4709bdcba0 100644 (file)
--- a/src/cmd/yacc/yacc.go
+++ b/src/cmd/yacc/yacc.go
@@ -3281,7 +3281,7 @@ out:
                c = $$Tok2[1] /* unknown char */
        }
        if $$Debug >= 3 {
-               __yyfmt__.Printf("lex %U %s\n", uint(char), $$Tokname(c))
+               __yyfmt__.Printf("lex %s(%d)\n", $$Tokname(c), uint(char))
        }
        return c
 }
@@ -3378,7 +3378,7 @@ $$default:
                        Nerrs++
                        if $$Debug >= 1 {
                                __yyfmt__.Printf("%s", $$Statname($$state))
-                               __yyfmt__.Printf("saw %s\n", $$Tokname($$char))
+                               __yyfmt__.Printf(" saw %s\n", $$Tokname($$char))
                        }
                        fallthrough