[src/trunk]: src/usr.bin/xlint/lint1 fix the grammar conflict differently.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6e833e190625
branches:  trunk
changeset: 772233:6e833e190625
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Dec 25 20:11:22 2011 +0000

description:
fix the grammar conflict differently.

diffstat:

 usr.bin/xlint/lint1/cgram.y |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r 354026d03e78 -r 6e833e190625 usr.bin/xlint/lint1/cgram.y
--- a/usr.bin/xlint/lint1/cgram.y       Sun Dec 25 12:32:36 2011 +0000
+++ b/usr.bin/xlint/lint1/cgram.y       Sun Dec 25 20:11:22 2011 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.52 2011/12/25 01:05:03 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.53 2011/12/25 20:11:22 christos Exp $ */
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.52 2011/12/25 01:05:03 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.53 2011/12/25 20:11:22 christos Exp $");
 #endif
 
 #include <stdlib.h>
@@ -1310,7 +1310,7 @@
        ;
 
 label:
-         identifier T_COLON {
+         T_NAME T_COLON {
                symtyp = FLAB;
                label(T_NAME, getsym($1), NULL);
          }
@@ -1804,11 +1804,9 @@
          T_NAME {
                $$ = $1;
          }
-/*
        | T_TYPENAME {
                $$ = $1;
          }
-*/
        ;
 
 %%