 @@ -1,15 +1,15 @@
 %{
-/* $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.
  * 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.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>
 #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.
 @@ -113,27 +113,27 @@ RESTORE_WARN_FLAGS(const char *file, siz
 #define clear_warning_flags()	CLEAR_WARN_FLAGS(__FILE__, __LINE__)
 #define save_warning_flags()	SAVE_WARN_FLAGS(__FILE__, __LINE__)
 #define restore_warning_flags()	RESTORE_WARN_FLAGS(__FILE__, __LINE__)
 /* unbind the anonymous struct members from the struct */
 static void
 anonymize(sym_t *s)
+{
 	for ( ; s != NULL; s = s->s_next)
 		s->s_styp = NULL;
+}
 %}
-%expect 162
+%expect 156
 %union {
 	val_t	*y_val;
 	sbuf_t	*y_sb;
 	sym_t	*y_sym;
 	op_t	y_op;
 	scl_t	y_scl;
 	tspec_t	y_tspec;
 	tqual_t	y_tqual;
 	type_t	*y_type;
 	tnode_t	*y_tnode;
 	range_t	y_range;
 	strg_t	*y_string;
 @@ -929,54 +929,49 @@ type_init_decl:
 		cgram_declare($1, false, $2);
 		check_size($1);
+	  }
 	| type_decl asm_or_symbolrename_opt {
 		begin_initialization($1);
 		cgram_declare($1, true, $2);
 	  } T_ASSIGN initializer {
 		check_size($1);
 		end_initialization();
+	  }
+	;
 notype_decl:
-	  notype_direct_decl
+	/* TODO: removing type_attribute_list_opt here removes another 18 conflicts */
-	| pointer notype_direct_decl {
+	  type_attribute_list_opt notype_direct_decl {
-		$$ = add_pointer($2, $1);
+		$$ = $2;
+	  }
 	| pointer type_attribute_list_opt notype_direct_decl {
 		$$ = add_pointer($3, $1);
+	  }
+	;
 type_decl:
 	  type_direct_decl
 	| pointer type_direct_decl {
 		$$ = add_pointer($2, $1);
+	  }
+	;
 /*
  * 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));
+	  }
 	| 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);
+	  }
 	| notype_direct_decl T_LBRACK array_size T_RBRACK {
 		$$ = add_array($1, true, to_int_constant($3, false));
+	  }
 	| notype_direct_decl param_list asm_or_symbolrename_opt {
 		$$ = add_function(symbolrename($1, $3), $2);
 		end_declaration_level();
 		block_level--;
+	  }
 	| notype_direct_decl type_attribute
+	;