 @@ -1,14 +1,14 @@
-/*	$NetBSD: decl_struct_member.c,v 1.7 2021/07/15 19:51:29 rillig Exp $	*/
+/*	$NetBSD: decl_struct_member.c,v 1.8 2021/07/15 20:05:49 rillig Exp $	*/
 # 3 "decl_struct_member.c"
 struct multi_attributes {
 	__attribute__((deprecated))
 	__attribute__((deprecated))
 	__attribute__((deprecated))
 	int deprecated;
 };
 struct cover_begin_type_noclass_declspecs {
 	int m1;
 	__attribute__((deprecated)) int m2;
 	const int m3;
 @@ -42,20 +42,20 @@ struct goto {
  * 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' */
 };
 /*
  * Before decl.c 1.188 from 2021-06-20, lint ran into a segmentation fault.
  */
 struct {
 	char a(_)0		/* expect: syntax error '0' */
 }				/* expect: ';' after last */
 /*
  * FIXME: adding a semicolon here triggers another assertion:
+ *
  * assertion "t == NOTSPEC" failed in end_type at decl.c:774
  */
 /* expect+1: cannot recover from previous errors */

 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.327 2021/07/15 18:18:15 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.328 2021/07/15 20:05:49 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.327 2021/07/15 18:18:15 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.328 2021/07/15 20:05:49 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.
 @@ -923,84 +923,75 @@ struct_or_union:		/* C99 6.7.2.1 */
 braced_struct_declaration_list:	/* see C99 6.7.2.1 */
 	  struct_declaration_lbrace struct_declaration_list_with_rbrace {
 		$$ = $2;
+	  }
+	;
 struct_declaration_lbrace:	/* see C99 6.7.2.1 */
 	  T_LBRACE {
 		symtyp = FVFT;
+	  }
+	;
 struct_declaration_list_with_rbrace:	/* see C99 6.7.2.1 */
-	  struct_declaration_list T_SEMI T_RBRACE
+	  struct_declaration_list T_RBRACE
 	| struct_declaration_list T_RBRACE {
 		if (sflag) {
 			/* syntax req. ';' after last struct/union member */
 			error(66);
 		} else {
 			/* syntax req. ';' after last struct/union member */
 			warning(66);
 		$$ = $1;
 	| T_RBRACE {
 		/* XXX: This is not allowed by any C standard. */
 		$$ = NULL;
+	  }
+	;
 struct_declaration_list:	/* C99 6.7.2.1 */
 	  struct_declaration
-	| struct_declaration_list T_SEMI struct_declaration {
+	| struct_declaration_list struct_declaration {
-		$$ = lnklst($1, $3);
+		$$ = lnklst($1, $2);
+	  }
+	;
 struct_declaration:		/* C99 6.7.2.1 */
 	  begin_type_noclass_declmods end_type {
 		/* too late, i know, but getsym() compensates it */
 		symtyp = FMEMBER;
-	  } notype_struct_declarators type_attribute_opt {
+	  } notype_struct_declarators type_attribute_opt T_SEMI {
 		symtyp = FVFT;
 		$$ = $4;
+	  }
 	| begin_type_noclass_declspecs end_type {
 		symtyp = FMEMBER;
-	  } type_struct_declarators type_attribute_opt {
+	  } type_struct_declarators type_attribute_opt T_SEMI {
 		symtyp = FVFT;
 		$$ = $4;
+	  }
-	| begin_type_noclass_declmods end_type type_attribute_opt {
+	| begin_type_noclass_declmods end_type type_attribute_opt T_SEMI {
 		/* syntax error '%s' */
 		error(249, "member without type");
 		$$ = NULL;
+	  }
-	| begin_type_noclass_declspecs end_type type_attribute_opt {
+	| begin_type_noclass_declspecs end_type type_attribute_opt T_SEMI {
 		symtyp = FVFT;
 		if (!Sflag)
 			/* anonymous struct/union members is a C9X feature */
 			warning(49);
 		if (is_struct_or_union(dcs->d_type->t_tspec)) {
 			$$ = dcs->d_type->t_str->sou_first_member;
 			/* add all the members of the anonymous struct/union */
 			anonymize($$);
 		} else {
 			/* syntax error '%s' */
 			error(249, "unnamed member");
 			$$ = NULL;
+		}
+	  }
-	| error {
+	| error T_SEMI {
 		symtyp = FVFT;
 		$$ = NULL;
+	  }
+	;
 notype_struct_declarators:
 	  notype_struct_declarator {
 		$$ = declarator_1_struct_union($1);
+	  }
 	| notype_struct_declarators {
 		symtyp = FMEMBER;
 	  } T_COMMA type_struct_declarator {
 		$$ = lnklst($1, declarator_1_struct_union($4));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.129 2021/07/13 22:01:34 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.130 2021/07/15 20:05:49 rillig Exp $	*/
 /*
  * 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
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.129 2021/07/13 22:01:34 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.130 2021/07/15 20:05:49 rillig Exp $");
 #endif
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "lint1.h"
 /* number of errors found */
 int	nerr;
 /* number of syntax errors */
 int	sytxerr;
 @@ -110,27 +110,27 @@ const char *const msgs[] = {
 	"declared argument %s is missing",			      /* 53 */
 	"trailing ',' prohibited in enum declaration",		      /* 54 */
 	"integral constant expression expected",		      /* 55 */
 	"integral constant too large",				      /* 56 */
 	"enumeration constant hides parameter: %s",		      /* 57 */
 	"type does not match prototype: %s",			      /* 58 */
 	"formal parameter lacks name: param #%d",		      /* 59 */
 	"void must be sole parameter",				      /* 60 */
 	"void parameter cannot have name: %s",			      /* 61 */
 	"function prototype parameters must have types",	      /* 62 */
 	"prototype does not match old-style definition",	      /* 63 */
 	"()-less function definition",				      /* 64 */
 	"%s has no named members",				      /* 65 */
-	"syntax requires ';' after last struct/union member",	      /* 66 */
+	"",							      /* 66 */
 	"cannot return incomplete type",			      /* 67 */
 	"typedef already qualified with '%s'",			      /* 68 */
 	"inappropriate qualifiers with 'void'",			      /* 69 */
 	"%soperand of '%s' is unsigned in ANSI C",		      /* 70 */
 	"too many characters in character constant",		      /* 71 */
 	"typedef declares no type name",			      /* 72 */
 	"empty character constant",				      /* 73 */
 	"no hex digits follow \\x",				      /* 74 */
 	"overflow in hex escape",				      /* 75 */
 	"character escape does not fit in character",		      /* 76 */
 	"bad octal digit %c",					      /* 77 */
 	"nonportable character escape",				      /* 78 */
 	"dubious escape \\%c",					      /* 79 */

 @@ -1,18 +1,21 @@
-/*	$NetBSD: decl_struct_c90.c,v 1.1 2021/07/15 19:51:29 rillig Exp $	*/
+/*	$NetBSD: decl_struct_c90.c,v 1.2 2021/07/15 20:05:49 rillig Exp $	*/
 # 3 "decl_struct_c90.c"
 /*
  * Test declaration of struct types, in C90 without any GNU extensions.
  */
 /* lint1-flags: -sw */
 /*
  * All of K&R, C90, C99 require that a struct member declaration is
- * terminated with a semicolon.  No idea why lint allows the missing
+ * terminated with a semicolon.
  * semicolon in non-C90 mode.
  * Before cgram.y 1.328 from 2021-07-15, lint allowed the missing semicolon
  * in non-C90 mode, no idea why.
  */
 struct missing_semicolon {
 	int member
 };
-/* expect-1: error: syntax requires ';' after last struct/union member [66] */
+/* expect-1: error: syntax error '}' [249] */
 /* expect+1: error: cannot recover from previous errors [224] */

 @@ -1,8 +1,7 @@
 decl_struct_member.c(34): error: syntax error 'goto' [249]
 decl_struct_member.c(36): error: illegal type combination [4]
 decl_struct_member.c(38): error: syntax error '}' [249]
 decl_struct_member.c(38): warning: empty declaration [0]
 decl_struct_member.c(47): error: syntax error 'unnamed member' [249]
 decl_struct_member.c(54): error: syntax error '0' [249]
 decl_struct_member.c(55): warning: syntax requires ';' after last struct/union member [66]
 decl_struct_member.c(62): error: cannot recover from previous errors [224]

 @@ -1,8 +1,15 @@
-/*	$NetBSD: msg_066.c,v 1.3 2021/01/31 11:12:07 rillig Exp $	*/
+/*	$NetBSD: msg_066.c,v 1.4 2021/07/15 20:05:49 rillig Exp $	*/
 # 3 "msg_066.c"
 // Test for message: syntax requires ';' after last struct/union member [66]
 /*
  * This message was removed in cgram.y 1.328 from 2021-07-15 because all
  * C standards and even K&R require a semicolon.
  */
 struct number {
 	int value
-};				/* expect: 66 */
+};
 /* expect-1: syntax error '}' [249] */
 /* expect+1: error: cannot recover from previous errors [224] */