clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-09-29 14:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve go.y edits

Browse Source 
R=r
OCL=14132
CL=14132
This commit is contained in:
Ken Thompson 2008-08-12 14:28:58 -07:00
parent 4797523572
commit c1ab5a554f
1 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/cmd/gc/go.y
View File

@ -840,12 +840,7 @@ sym2:
/*
* keywords that we can
>>>> ORIGINAL go/src/cmd/gc/go.y#8
==== THEIRS go/src/cmd/gc/go.y#9
* use as field names
==== YOURS go/src/cmd/gc/go.y
* use a variable/type names
<<<<
* use as variable/type names
*/
key1:
LNIL
@ -860,6 +855,7 @@ key1:
/*
* keywords that we can
* use as field names
*/
key2:
LPACKAGE
@ -890,36 +886,6 @@ key2:
| LRANGE
| LIGNORE
>>>> ORIGINAL go/src/cmd/gc/go.y#8
* use a variable/type names
*/
key2:
LNIL
| LTRUE
| LFALSE
| LIOTA
| LLEN
| LPANIC
| LPRINT
| LNEW
| LBASETYPE
==== THEIRS go/src/cmd/gc/go.y#9
* use as variable/type names
*/
key2:
LNIL
| LTRUE
| LFALSE
| LIOTA
| LLEN
| LPANIC
| LPRINT
| LNEW
| LBASETYPE
==== YOURS src/cmd/gc/go.y
<<<<
name:
lname
{