 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.277 2021/07/09 20:51:27 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.278 2021/07/10 04:25:47 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.277 2021/07/09 20:51:27 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.278 2021/07/10 04:25:47 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.
 @@ -393,46 +393,27 @@ top_level_declaration:		/* C99 6.9 calls
 			/* empty declaration */
 			warning(0);
+		}
+	  }
 	| clrtyp deftyp notype_init_decls T_SEMI {
 		if (sflag) {
 			/* old style declaration; add 'int' */
 			error(1);
 		} else if (!tflag) {
 			/* old style declaration; add 'int' */
 			warning(1);
+		}
+	  }
-	| declmods deftyp T_SEMI {
+	| declaration_noerror
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else {
 			/* empty declaration */
 			warning(2);
 	| declmods deftyp notype_init_decls T_SEMI
 	| declaration_specifiers deftyp T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else if (!dcs->d_nonempty_decl) {
 			/* empty declaration */
 			warning(2);
 	| declaration_specifiers deftyp type_init_decls T_SEMI
 	| error T_SEMI {
 		global_clean_up();
+	  }
 	| error T_RBRACE {
 		global_clean_up();
+	  }
+	;
 function_definition:		/* C99 6.9.1 */
 	  func_decl {
 		if ($1->s_type->t_tspec != FUNC) {
 			/* syntax error '%s' */
 			error(249, yytext);
 @@ -504,47 +485,51 @@ arg_declaration:
+		}
+	  }
 	| declaration_specifiers deftyp type_init_decls T_SEMI {
 		if (dcs->d_nonempty_decl) {
 			/* '%s' declared in argument declaration list */
 			warning(3, type_name(dcs->d_type));
+		}
+	  }
 	| declmods error
 	| declaration_specifiers error
+	;
 declaration:			/* C99 6.7 */
 	  declaration_noerror
 	| error T_SEMI
+	;
 declaration_noerror:		/* see C99 6.7 'declaration' */
 	  declmods deftyp T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| declmods deftyp notype_init_decls T_SEMI
 	| declaration_specifiers deftyp T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else if (!dcs->d_nonempty_decl) {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| declaration_specifiers deftyp type_init_decls T_SEMI
 	| error T_SEMI
+	;
 clrtyp:
 	  /* empty */ {
 		clrtyp();
+	  }
+	;
 deftyp:
 	  /* empty */ {
 		deftyp();
+	  }
+	;