 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.304 2021/07/10 21:44:51 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.305 2021/07/10 22:46:02 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.304 2021/07/10 21:44:51 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.305 2021/07/10 22:46:02 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.
 @@ -114,27 +114,27 @@ RESTORE_WARN_FLAGS(const char *file, siz
 #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 136
+%expect 131
 %union {
 	val_t	*y_val;
 	sbuf_t	*y_name;
 	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;
 @@ -705,27 +705,27 @@ struct_declaration:
 			/* syntax error '%s' */
 			error(249, "unnamed member");
 			$$ = NULL;
+		}
+	  }
 	| error {
 		symtyp = FVFT;
 		$$ = NULL;
+	  }
+	;
 noclass_declspecs:
 	  noclass_declspecs_postfix
-	| type_attribute noclass_declspecs_postfix
+	| type_attribute noclass_declspecs
+	;
 noclass_declspecs_postfix:
 	  add_type_specifier
 	| add_type_qualifier_list add_type_specifier
 	| noclass_declspecs_postfix add_type_qualifier
 	| noclass_declspecs_postfix add_notype_type_specifier
 	| noclass_declspecs_postfix type_attribute
+	;
 add_type_qualifier_list:
 	  add_type_qualifier
 	| add_type_qualifier_list add_type_qualifier

 @@ -1,19 +1,18 @@
-/*	$NetBSD: decl_struct_member.c,v 1.4 2021/07/10 22:34:02 rillig Exp $	*/
+/*	$NetBSD: decl_struct_member.c,v 1.5 2021/07/10 22:46:02 rillig Exp $	*/
 # 3 "decl_struct_member.c"
 struct multi_attributes {
 	__attribute__((deprecated))
 	/* expect+1: error: syntax error '__attribute__' [249] */
 	__attribute__((deprecated))
 	__attribute__((deprecated))
 	int deprecated;
 };
 /*
  * Before cgram.y 1.228 from 2021-06-19, lint ran into an assertion failure:
+ *
  * "is_struct_or_union(dcs->d_type->t_tspec)" at cgram.y:846
  */
 struct {
 	char;			/* expect: syntax error 'unnamed member' */
 };

 @@ -1,5 +1,4 @@
-decl_struct_member.c(7): error: syntax error '__attribute__' [249]
+decl_struct_member.c(17): error: syntax error 'unnamed member' [249]
-decl_struct_member.c(18): error: syntax error 'unnamed member' [249]
+decl_struct_member.c(24): error: syntax error '0' [249]
-decl_struct_member.c(25): error: syntax error '0' [249]
+decl_struct_member.c(25): warning: syntax requires ';' after last struct/union member [66]
-decl_struct_member.c(26): warning: syntax requires ';' after last struct/union member [66]
+decl_struct_member.c(32): error: cannot recover from previous errors [224]
 decl_struct_member.c(33): error: cannot recover from previous errors [224]