Revert "go/scanner, go/token: recognize => (ALIAS) token"

This reverts commit 776a90100f1f65fcf54dfd3d082d657341bdc323.

Reason: Decision to back out current alias implementation.

For #16339.

Change-Id: Icb451a122c661ded05d9293356b466fa72b965f3
Reviewed-on: https://go-review.googlesource.com/32824
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

diff --git a/src/go/scanner/scanner.go b/src/go/scanner/scanner.go
index 866744df03624d79ba32254c3f655b1fd229d4dd..a86e4eb668c4decff1e33095f6c9770ebfa303a9 100644 (file)
--- a/src/go/scanner/scanner.go
+++ b/src/go/scanner/scanner.go
@@ -735,7 +735,7 @@ scanAgain:
                case '>':
                        tok = s.switch4(token.GTR, token.GEQ, '>', token.SHR, token.SHR_ASSIGN)
                case '=':
-                       tok = s.switch3(token.ASSIGN, token.EQL, '>', token.ALIAS)
+                       tok = s.switch2(token.ASSIGN, token.EQL)
                case '!':
                        tok = s.switch2(token.NOT, token.NEQ)
                case '&':

diff --git a/src/go/scanner/scanner_test.go b/src/go/scanner/scanner_test.go
index c07ef1109eb70b7a4ce9e036c79b516b5baf8303..ff41c036f002ce90976766b7f932ecfba4edee79 100644 (file)
--- a/src/go/scanner/scanner_test.go
+++ b/src/go/scanner/scanner_test.go
@@ -121,7 +121,6 @@ var tokens = [...]elt{
        {token.LAND, "&&", operator},
        {token.LOR, "||", operator},
        {token.ARROW, "<-", operator},
-       {token.ALIAS, "=>", operator},
        {token.INC, "++", operator},
        {token.DEC, "--", operator},
 

diff --git a/src/go/token/token.go b/src/go/token/token.go
index 7ad4290fb9d99b3c9c8c7787a189327543f25a7c..865f63f4a146ca03da07074106c59f466a9b9c07 100644 (file)
--- a/src/go/token/token.go
+++ b/src/go/token/token.go
@@ -121,10 +121,6 @@ const (
        TYPE
        VAR
        keyword_end
-
-       // Alias support - must add at end to pass Go 1 compatibility test
-
-       ALIAS // =>
 )
 
 var tokens = [...]string{
@@ -225,8 +221,6 @@ var tokens = [...]string{
        SWITCH: "switch",
        TYPE:   "type",
        VAR:    "var",
-
-       ALIAS: "=>",
 }
 
 // String returns the string corresponding to the token tok.
@@ -306,7 +300,7 @@ func (tok Token) IsLiteral() bool { return literal_beg < tok && tok < literal_en
 // IsOperator returns true for tokens corresponding to operators and
 // delimiters; it returns false otherwise.
 //
-func (tok Token) IsOperator() bool { return operator_beg < tok && tok < operator_end || tok == ALIAS }
+func (tok Token) IsOperator() bool { return operator_beg < tok && tok < operator_end }
 
 // IsKeyword returns true for tokens corresponding to keywords;
 // it returns false otherwise.