 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.325 2021/07/15 17:20:57 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.326 2021/07/15 18:13:25 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.325 2021/07/15 17:20:57 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.326 2021/07/15 18:13:25 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.
 @@ -171,27 +171,27 @@ anonymize(sym_t *s)
 %token			T_COMMA
 %token			T_SEMI
 %token			T_ELLIPSIS
 %token			T_REAL
 %token			T_IMAG
 %token			T_GENERIC
 %token			T_NORETURN
 /* storage classes (extern, static, auto, register and typedef) */
 %token	<y_scl>		T_SCLASS
 /*
  * predefined type keywords (char, int, short, long, unsigned, signed,
- * float, double, void); see T_TYPENAME
+ * float, double, void); see T_TYPENAME for types from typedef
  */
 %token	<y_tspec>	T_TYPE
 /* qualifiers (const, volatile, restrict, _Thread_local) */
 %token	<y_tqual>	T_QUAL
 /* struct or union */
 %token	<y_tspec>	T_STRUCT_OR_UNION
 /* remaining keywords */
 %token			T_ASM
 %token			T_BREAK
 %token			T_CASE
 @@ -517,27 +517,27 @@ comma_opt:			/* helper for 'postfix_expr
 /*
  * The inner part of a GCC statement-expression of the form ({ ... }).
+ *
  * https://gcc.gnu.org/onlinedocs/gcc/Statement-Exprs.html
  */
 gcc_statement_expr_list:
 	  gcc_statement_expr_item
 	| gcc_statement_expr_list gcc_statement_expr_item {
 		$$ = $2;
+	  }
+	;
 gcc_statement_expr_item:
-	  declaration {
+	  declaration_or_error {
 		clear_warning_flags();
 		$$ = NULL;
+	  }
 	| non_expr_statement {
 		$$ = expr_zalloc_tnode();
 		$$->tn_type = gettyp(VOID);
+	  }
 	| expression T_SEMI {
 		if ($1 == NULL) {	/* in case of syntax errors */
 			$$ = expr_zalloc_tnode();
 			$$->tn_type = gettyp(VOID);
 		} else {
 			/* XXX: do that only on the last name */
 @@ -710,49 +710,53 @@ constant_expr_list_opt:		/* helper for g
 	  /* empty */
 	| constant_expr_list
+	;
 constant_expr_list:		/* helper for gcc_attribute */
 	  constant_expr
 	| constant_expr_list T_COMMA constant_expr
+	;
 constant_expr:			/* C99 6.6 */
 	  conditional_expression
+	;
 declaration_or_error:
 	  declaration
 	| error T_SEMI
+	;
 declaration:			/* C99 6.7 */
 	  begin_type_declmods end_type T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| begin_type_declmods end_type notype_init_declarators T_SEMI
 	| begin_type_declaration_specifiers end_type T_SEMI {
 		if (dcs->d_scl == TYPEDEF) {
 			/* typedef declares no type name */
 			warning(72);
 		} else if (!dcs->d_nonempty_decl) {
 			/* empty declaration */
 			warning(2);
+		}
+	  }
 	| begin_type_declaration_specifiers end_type
 	    type_init_declarators T_SEMI
 	| error T_SEMI
+	;
 begin_type_declaration_specifiers:	/* see C99 6.7 */
 	  begin_type_typespec {
 		add_type($1);
+	  }
 	| begin_type_declmods type_specifier {
 		add_type($2);
+	  }
 	| type_attribute begin_type_declaration_specifiers
 	| begin_type_declaration_specifiers declmod
 	| begin_type_declaration_specifiers notype_type_specifier {
 		add_type($2);
 @@ -1662,27 +1666,27 @@ compound_statement_rbrace:
+	;
 block_item_list:		/* C99 6.8.2 */
 	  block_item
 	| block_item_list block_item {
 		if (!Sflag && $1 && !$2)
 			/* declarations after statements is a C99 feature */
 			c99ism(327);
 		$$ = $1 || $2;
+	  }
+	;
 block_item:			/* C99 6.8.2 */
-	  declaration {
+	  declaration_or_error {
 		$$ = false;
 		restore_warning_flags();
+	  }
 	| statement {
 		$$ = true;
 		restore_warning_flags();
+	  }
+	;
 expression_statement:		/* C99 6.8.3 */
 	  expression T_SEMI {
 		expr($1, false, false, false, false);
 		seen_fallthrough = false;

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.114 2021/07/10 17:35:54 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.115 2021/07/15 18:13:25 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
 @@ -199,31 +199,31 @@ struct lint1_type {
 #define	t_foffs	t_b._t_foffs
 /*
  * types of symbols
  */
 typedef	enum {
 	FVFT,		/* variables, functions, type names, enums */
 	FMEMBER,	/* members of structs or unions */
 	FTAG,		/* tags */
 	FLABEL		/* labels */
 } symt_t;
 /*
- * storage classes
+ * storage classes and related things
  */
 typedef enum {
 	NOSCL,
-	EXTERN,		/* external symbols (indep. of decl_t) */
+	EXTERN,		/* external symbols (independent of decl_t) */
 	STATIC,		/* static symbols (local and global) */
 	AUTO,		/* automatic symbols (except register) */
 	REG,		/* register */
 	TYPEDEF,	/* typedef */
 	STRUCT_TAG,
 	UNION_TAG,
 	ENUM_TAG,
 	MOS,		/* member of struct */
 	MOU,		/* member of union */
 	CTCONST,	/* enumerator, enum constant or bool constant */
 	ABSTRACT,	/* abstract symbol (sizeof, casts, unnamed argument) */
 	ARG,		/* argument */
 	PROTO_ARG,	/* used in declaration stack during prototype