summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--usr/gri/pretty/Makefile.iant29
-rw-r--r--usr/gri/pretty/scanner.go2
2 files changed, 14 insertions, 17 deletions
diff --git a/usr/gri/pretty/Makefile.iant b/usr/gri/pretty/Makefile.iant
index 0fdc0e697..603261a11 100644
--- 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 921292720..01b3cd204 100644
--- 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) + ")";
}