- more robust TokenString implementation

R=r
OCL=17319
CL=17319

diff --git a/usr/gri/pretty/Makefile.iant b/usr/gri/pretty/Makefile.iant
index 0fdc0e6976bd6e74a5a2505c18e22d54a82ae203..603261a11dd00ec496d501324aa46607db995c07 100644 (file)
--- a/usr/gri/pretty/Makefile.iant
+++ b/usr/gri/pretty/Makefile.iant
@@ -8,6 +8,19 @@ GO = /home/iant/go/bin/gccgo
 
 LDFLAGS = -Wl,-R,/home/iant/go/lib
 
+PRETTY_OBJS = \
+       node.o \
+       pretty.o \
+       parser.o \
+       platform.o \
+       printer.o \
+       scanner.o \
+       utils.o \
+       flag.o \
+       fmt.o \
+
+pretty: $(PRETTY_OBJS)
+       $(GO) $(LDFLAGS) -o $@ $(PRETTY_OBJS)
 
 test: pretty
        pretty -s *.go
@@ -47,19 +60,3 @@ fmt.o:
 
 .go.o:
        $(GO) -O2 -c -g $<
-
-
-PRETTY_OBJS = \
-       node.o \
-       pretty.o \
-       parser.o \
-       platform.o \
-       printer.o \
-       scanner.o \
-       utils.o \
-       flag.o \
-       fmt.o \
-
-pretty: $(PRETTY_OBJS)
-       $(GO) $(LDFLAGS) -o $@ $(PRETTY_OBJS)
-

diff --git a/usr/gri/pretty/scanner.go b/usr/gri/pretty/scanner.go
index 9212927207973cf5bd12ed547c7b229d0ac1d641..01b3cd2045cf4f75e6e730827d9856694612720a 100644 (file)
--- a/usr/gri/pretty/scanner.go
+++ b/usr/gri/pretty/scanner.go
@@ -201,7 +201,7 @@ export func TokenString(tok int) string {
        case VAR: return "var";
        }
        
-       panic("UNREACHABLE");
+       return "token(" + Utils.IntToString(tok, 10) + ")";
 }