From 8fd7c11d594c28d359839e4e6d2727aab5609c80 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 1 Mar 2016 14:47:26 -0800 Subject: [PATCH] cmd/compile: delete unused lexer tokens, replace with LOPER Also: Use same ordering of tokens in the various tables/maps. Change-Id: Ief84c6ca3da36213ace6b2c10b513e2ca16318ab Reviewed-on: https://go-review.googlesource.com/20110 Run-TryBot: Robert Griesemer TryBot-Result: Gobot Gobot Reviewed-by: Matthew Dempsky --- src/cmd/compile/internal/gc/lex.go | 80 ++++++++++++--------------- src/cmd/compile/internal/gc/parser.go | 36 +++++------- 2 files changed, 49 insertions(+), 67 deletions(-) diff --git a/src/cmd/compile/internal/gc/lex.go b/src/cmd/compile/internal/gc/lex.go index bb8bfdf80fa..13695f1455f 100644 --- a/src/cmd/compile/internal/gc/lex.go +++ b/src/cmd/compile/internal/gc/lex.go @@ -892,7 +892,7 @@ type lexer struct { tok int32 sym_ *Sym // valid if tok == LNAME val Val // valid if tok == LLITERAL - op Op // valid if tok == LASOP or LINCOP, or prec > 0 + op Op // valid if tok == LOPER, LASOP, or LINCOP, or prec > 0 prec OpPrec // operator precedence; 0 if not a binary operator } @@ -911,15 +911,27 @@ const ( const ( // The value of single-char tokens is just their character's Unicode value. // They are all below utf8.RuneSelf. Shift other tokens up to avoid conflicts. - LLITERAL = utf8.RuneSelf + iota + + // names and literals + LNAME = utf8.RuneSelf + iota + LLITERAL + + // operator-based operations + LOPER LASOP + LINCOP + + // miscellaneous LCOLAS + LCOMM + LDDD + + // keywords LBREAK LCASE LCHAN LCONST LCONTINUE - LDDD LDEFAULT LDEFER LELSE @@ -932,7 +944,6 @@ const ( LIMPORT LINTERFACE LMAP - LNAME LPACKAGE LRANGE LRETURN @@ -941,20 +952,8 @@ const ( LSWITCH LTYPE LVAR - LANDAND - LANDNOT - LCOMM - LEQ - LGE - LGT + LIGNORE - LINCOP - LLE - LLSH - LLT - LNE - LOROR - LRSH ) func (l *lexer) next() { @@ -1119,9 +1118,9 @@ l0: goto incop case '>': + c = LOPER c1 = l.getr() if c1 == '>' { - c = LRSH op = ORSH prec = PMUL goto binop @@ -1129,17 +1128,15 @@ l0: l.prec = PCMP if c1 == '=' { - c = LGE l.op = OGE goto lx } - c = LGT l.op = OGT case '<': + c = LOPER c1 = l.getr() if c1 == '<' { - c = LLSH op = OLSH prec = PMUL goto binop @@ -1157,17 +1154,15 @@ l0: l.prec = PCMP if c1 == '=' { - c = LLE l.op = OLE goto lx } - c = LLT l.op = OLT case '=': c1 = l.getr() if c1 == '=' { - c = LEQ + c = LOPER l.prec = PCMP l.op = OEQ goto lx @@ -1176,7 +1171,7 @@ l0: case '!': c1 = l.getr() if c1 == '=' { - c = LNE + c = LOPER l.prec = PCMP l.op = ONE goto lx @@ -1185,14 +1180,14 @@ l0: case '&': c1 = l.getr() if c1 == '&' { - c = LANDAND + c = LOPER l.prec = PANDAND l.op = OANDAND goto lx } if c1 == '^' { - c = LANDNOT + c = LOPER op = OANDNOT prec = PMUL goto binop @@ -1205,7 +1200,7 @@ l0: case '|': c1 = l.getr() if c1 == '|' { - c = LOROR + c = LOPER l.prec = POROR l.op = OOROR goto lx @@ -2259,44 +2254,37 @@ func lexfini() { } var lexn = map[rune]string{ - LANDAND: "ANDAND", - LANDNOT: "ANDNOT", - LASOP: "ASOP", + LNAME: "NAME", + LLITERAL: "LITERAL", + + LOPER: "OPER", + LASOP: "ASOP", + LINCOP: "INCOP", + + LCOLAS: "COLAS", + LCOMM: "COMM", + LDDD: "DDD", + LBREAK: "BREAK", LCASE: "CASE", LCHAN: "CHAN", - LCOLAS: "COLAS", - LCOMM: "<-", LCONST: "CONST", LCONTINUE: "CONTINUE", - LDDD: "...", LDEFAULT: "DEFAULT", LDEFER: "DEFER", LELSE: "ELSE", - LEQ: "EQ", LFALL: "FALL", LFOR: "FOR", LFUNC: "FUNC", - LGE: "GE", LGO: "GO", LGOTO: "GOTO", - LGT: "GT", LIF: "IF", LIMPORT: "IMPORT", - LINCOP: "INCOP", LINTERFACE: "INTERFACE", - LLE: "LE", - LLITERAL: "LITERAL", - LLSH: "LSH", - LLT: "LT", LMAP: "MAP", - LNAME: "NAME", - LNE: "NE", - LOROR: "OROR", LPACKAGE: "PACKAGE", LRANGE: "RANGE", LRETURN: "RETURN", - LRSH: "RSH", LSELECT: "SELECT", LSTRUCT: "STRUCT", LSWITCH: "SWITCH", diff --git a/src/cmd/compile/internal/gc/parser.go b/src/cmd/compile/internal/gc/parser.go index c8dbcc56b1d..983ffa356f5 100644 --- a/src/cmd/compile/internal/gc/parser.go +++ b/src/cmd/compile/internal/gc/parser.go @@ -92,14 +92,16 @@ func (p *parser) syntax_error(msg string) { // determine token string var tok string switch p.tok { - case LLITERAL: - tok = litbuf case LNAME: if p.sym_ != nil && p.sym_.Name != "" { tok = p.sym_.Name } else { tok = "name" } + case LLITERAL: + tok = litbuf + case LOPER: + tok = goopnames[p.op] case LASOP: tok = goopnames[p.op] + "=" case LINCOP: @@ -188,15 +190,22 @@ func tokstring(tok int32) string { } var tokstrings = map[int32]string{ - LLITERAL: "LLITERAL", - LASOP: "op=", - LCOLAS: ":=", + LNAME: "NAME", + LLITERAL: "LITERAL", + + LOPER: "op", + LASOP: "op=", + LINCOP: "opop", + + LCOLAS: ":=", + LCOMM: "<-", + LDDD: "...", + LBREAK: "break", LCASE: "case", LCHAN: "chan", LCONST: "const", LCONTINUE: "continue", - LDDD: "...", LDEFAULT: "default", LDEFER: "defer", LELSE: "else", @@ -209,7 +218,6 @@ var tokstrings = map[int32]string{ LIMPORT: "import", LINTERFACE: "interface", LMAP: "map", - LNAME: "LNAME", LPACKAGE: "package", LRANGE: "range", LRETURN: "return", @@ -218,20 +226,6 @@ var tokstrings = map[int32]string{ LSWITCH: "switch", LTYPE: "type", LVAR: "var", - LANDAND: "&&", - LANDNOT: "&^", - LCOMM: "<-", - LEQ: "==", - LGE: ">=", - LGT: ">", - LIGNORE: "LIGNORE", // we should never see this one - LINCOP: "opop", - LLE: "<=", - LLSH: "<<", - LLT: "<", - LNE: "!=", - LOROR: "||", - LRSH: ">>", } // usage: defer p.trace(msg)()