 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.268 2021/07/08 03:22:47 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.269 2021/07/08 03:35:07 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.268 2021/07/08 03:22:47 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.269 2021/07/08 03:35:07 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.
 @@ -280,27 +280,27 @@ anonymize(sym_t *s)
 %type	<y_sym>		func_decl
 %type	<y_sym>		notype_decl
 %type	<y_sym>		type_decl
 %type	<y_type>	typespec
 %type	<y_type>	clrtyp_typespec
 %type	<y_type>	notype_typespec
 %type	<y_type>	struct_spec
 %type	<y_type>	enum_spec
 %type	<y_sym>		struct_tag
 %type	<y_sym>		enum_tag
 %type	<y_tspec>	struct
 %type	<y_sym>		struct_declaration
 %type	<y_sb>		identifier
-%type	<y_sym>		member_declaration_list_with_rbrace
+%type	<y_sym>		member_declaration_list_semi
 %type	<y_sym>		member_declaration_list
 %type	<y_sym>		member_declaration
 %type	<y_sym>		notype_member_decls
 %type	<y_sym>		type_member_decls
 %type	<y_sym>		notype_member_decl
 %type	<y_sym>		type_member_decl
 %type	<y_tnode>	constant_expr
 %type	<y_tnode>	array_size
 %type	<y_sym>		enum_declaration
 %type	<y_sym>		enumerator_list
 %type	<y_sym>		enumerator
 %type	<y_sym>		enumeration_constant
 %type	<y_sym>		notype_direct_decl
 @@ -652,52 +652,48 @@ struct:
 		dcs->d_offset = 0;
 		dcs->d_sou_align_in_bits = CHAR_SIZE;
 		$$ = $1;
+	  }
+	;
 struct_tag:
 	  identifier {
 		$$ = getsym($1);
+	  }
+	;
 struct_declaration:
 	  struct_decl_lbrace member_declaration_list_with_rbrace {
 		$$ = $2;
 struct_decl_lbrace:
 	  T_LBRACE {
 		symtyp = FVFT;
 	  } member_declaration_list_semi T_RBRACE {
 		$$ = $3;
+	  }
+	;
-member_declaration_list_with_rbrace:
+member_declaration_list_semi:
-	  member_declaration_list T_SEMI T_RBRACE
+	  /* empty */ {
-	| member_declaration_list T_RBRACE {
+		$$ = NULL;
+	  }
 	| member_declaration_list T_SEMI
 	| member_declaration_list {
 		if (sflag) {
 			/* syntax req. ';' after last struct/union member */
 			error(66);
 		} else {
 			/* syntax req. ';' after last struct/union member */
 			warning(66);
+		}
 		$$ = $1;
+	  }
 	| T_RBRACE {
 		$$ = NULL;
+	;
 member_declaration_list:
 	  member_declaration
 	| member_declaration_list T_SEMI member_declaration {
 		$$ = lnklst($1, $3);
+	  }
+	;
 member_declaration:
 	  noclass_declmods deftyp {
 		/* too late, i know, but getsym() compensates it */
 		symtyp = FMEMBER;