From c1ab5a554ff96dc4d0846863086c2b165f4909a5 Mon Sep 17 00:00:00 2001 From: Ken Thompson Date: Tue, 12 Aug 2008 14:28:58 -0700 Subject: [PATCH] resolve go.y edits R=r OCL=14132 CL=14132 --- src/cmd/gc/go.y | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/src/cmd/gc/go.y b/src/cmd/gc/go.y index a997193d45..f660c887a7 100644 --- a/src/cmd/gc/go.y +++ b/src/cmd/gc/go.y @@ -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 { -- 2.48.1