From: Robert Griesemer <gri@golang.org>
Date: Fri, 4 Nov 2016 23:11:48 +0000 (-0700)
Subject: Revert "go/scanner, go/token: recognize => (ALIAS) token"
X-Git-Tag: go1.8beta1~295
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a1a688fa0012f7ce3a37e9ac0070461fe8e3f28e;p=gostls13.git

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 866744df03..a86e4eb668 100644
--- 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 c07ef1109e..ff41c036f0 100644
--- 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 7ad4290fb9..865f63f4a1 100644
--- 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.