Skip to content

G
golang
Commit c1ab5a55 authored by Ken Thompson's avatar Ken Thompson
Browse files
Options

resolve go.y edits 

R=r
OCL=14132
CL=14132
parent 47975235
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 36 deletions
src/cmd/gc/go.y
View file @ c1ab5a55
...@@ -840,12 +840,7 @@ sym2: ...@@ -840,12 +840,7 @@ sym2:
/* /*
* keywords that we can * keywords that we can
>>>> ORIGINAL go/src/cmd/gc/go.y#8 * use as variable/type names
==== THEIRS go/src/cmd/gc/go.y#9
* use as field names
==== YOURS go/src/cmd/gc/go.y
* use a variable/type names
<<<<
*/ */
key1: key1:
LNIL LNIL
...@@ -860,6 +855,7 @@ key1: ...@@ -860,6 +855,7 @@ key1:
/* /*
* keywords that we can * keywords that we can
* use as field names
*/ */
key2: key2:
LPACKAGE LPACKAGE
...@@ -890,36 +886,6 @@ key2: ...@@ -890,36 +886,6 @@ key2:
| LRANGE | LRANGE
| LIGNORE | 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: name:
lname lname
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment