Tue Jul 6 21:41:36 2021 UTC ()

lint: document further shift/reduce conflicts

These cannot be resolved as easily as those from the previous commit.
Anyway, the relevant code from the grammar is not yet covered by the
tests, this needs to be done first.


(rillig)

diff -r1.264 -r1.265 src/usr.bin/xlint/lint1/cgram.y

--- src/usr.bin/xlint/lint1/cgram.y 2021/07/06 20:56:38	1.264
+++ src/usr.bin/xlint/lint1/cgram.y 2021/07/06 21:41:36	1.265

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.264 2021/07/06 20:56:38 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.265 2021/07/06 21:41:36 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.264 2021/07/06 20:56:38 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.265 2021/07/06 21:41:36 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -739,26 +739,31 @@ member_declaration:
 			anonymize($$);
 		} else {
 			/* syntax error '%s' */
 			error(249, "unnamed member");
 			$$ = NULL;
+		}
+	  }
 	| error {
 		symtyp = FVFT;
 		$$ = NULL;
+	  }
+	;
 /*
  * XXX: shift/reduce conflict, caused by:
  *	type_attribute noclass_declspecs
  *	noclass_declspecs type_attribute
  */
 noclass_declspecs:
 	  clrtyp_typespec {
 		add_type($1);
+	  }
 	| type_attribute noclass_declspecs
 	| noclass_declmods typespec {
 		add_type($2);
+	  }
 	| noclass_declspecs T_QUAL {
 		add_qualifier($2);
+	  }
 	| noclass_declspecs notype_typespec {
 		add_type($2);
 @@ -1342,26 +1347,31 @@ abstract_declaration:
 abstract_declarator:		/* C99 6.7.6 */
 	  pointer {
 		$$ = add_pointer(abstract_name(), $1);
+	  }
 	| direct_abstract_declarator
 	| pointer direct_abstract_declarator {
 		$$ = add_pointer($2, $1);
+	  }
 	| T_TYPEOF term {	/* GCC extension */
 		$$ = mktempsym($2->tn_type);
+	  }
+	;
 /*
  * XXX: shift/reduce conflict, caused by:
  *	type_attribute direct_abstract_declarator
  *	direct_abstract_declarator type_attribute
  */
 direct_abstract_declarator:		/* C99 6.7.6 */
 	  T_LPAREN abstract_declarator T_RPAREN {
 		$$ = $2;
+	  }
 	| T_LBRACK T_RBRACK {
 		$$ = add_array(abstract_name(), false, 0);
+	  }
 	| T_LBRACK array_size T_RBRACK {
 		$$ = add_array(abstract_name(), true, to_int_constant($2, false));
+	  }
 	| type_attribute direct_abstract_declarator {
 		$$ = $2;
+	  }