[src/trunk]: src/usr.bin/xlint/lint1 lint: remove 6 of the remaining 162 conf...

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

details:   https://anonhg.NetBSD.org/src/rev/46e4eb6e343d
branches:  trunk
changeset: 984477:46e4eb6e343d
user:      rillig <rillig%NetBSD.org@localhost>
date:      Fri Jul 09 20:36:34 2021 +0000

description:
lint: remove 6 of the remaining 162 conflicts from the grammar

No functional change.

diffstat:

 usr.bin/xlint/lint1/cgram.y |  23 +++++++++--------------
 1 files changed, 9 insertions(+), 14 deletions(-)

diffs (66 lines):

diff -r bea38b2af563 -r 46e4eb6e343d usr.bin/xlint/lint1/cgram.y
--- a/usr.bin/xlint/lint1/cgram.y       Fri Jul 09 20:20:03 2021 +0000
+++ b/usr.bin/xlint/lint1/cgram.y       Fri Jul 09 20:36:34 2021 +0000
@@ -1,5 +1,5 @@
 %{
-/* $NetBSD: cgram.y,v 1.275 2021/07/09 06:37:11 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.276 2021/07/09 20:36:34 rillig 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.275 2021/07/09 06:37:11 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.276 2021/07/09 20:36:34 rillig Exp $");
 #endif
 
 #include <limits.h>
@@ -123,7 +123,7 @@
 }
 %}
 
-%expect 162
+%expect 156
 
 %union {
        val_t   *y_val;
@@ -939,9 +939,12 @@
        ;
 
 notype_decl:
-         notype_direct_decl
-       | pointer notype_direct_decl {
-               $$ = add_pointer($2, $1);
+       /* TODO: removing type_attribute_list_opt here removes another 18 conflicts */
+         type_attribute_list_opt notype_direct_decl {
+               $$ = $2;
+         }
+       | pointer type_attribute_list_opt notype_direct_decl {
+               $$ = add_pointer($3, $1);
          }
        ;
 
@@ -952,11 +955,6 @@
          }
        ;
 
-/*
- * XXX: shift/reduce conflict, caused by:
- *     type_attribute notype_direct_decl
- *     notype_direct_decl type_attribute
- */
 notype_direct_decl:
          T_NAME {
                $$ = declarator_name(getsym($1));
@@ -964,9 +962,6 @@
        | T_LPAREN type_decl T_RPAREN {
                $$ = $2;
          }
-       | type_attribute notype_direct_decl {
-               $$ = $2;
-         }
        | notype_direct_decl T_LBRACK T_RBRACK {
                $$ = add_array($1, false, 0);
          }