 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.452 2023/07/10 19:58:47 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.453 2023/07/11 20:54:23 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)
-__RCSID("$NetBSD: cgram.y,v 1.452 2023/07/10 19:58:47 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.453 2023/07/11 20:54:23 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.
 @@ -1156,30 +1156,30 @@ enum_declaration:		/* helper for C99 6.7
+	;
 enum_decl_lbrace:		/* helper for C99 6.7.2.2 */
 	  T_LBRACE {
 		set_symtyp(FVFT);
 		enumval = 0;
+	  }
+	;
 enums_with_opt_comma:		/* helper for C99 6.7.2.2 */
 	  enumerator_list
 	| enumerator_list T_COMMA {
 		if (!allow_c99 && !allow_trad) {
-			/* trailing ',' prohibited in enum declaration */
+			/* trailing ',' in enum declaration requires C99 ... */
 			error(54);
 		} else {
-			/* trailing ',' prohibited in enum declaration */
+			/* trailing ',' in enum declaration requires C99 ... */
 			c99ism(54);
+		}
 		$$ = $1;
+	  }
+	;
 enumerator_list:		/* C99 6.7.2.2 */
 	  enumerator
 	| enumerator_list T_COMMA enumerator {
 		$$ = concat_symbols($1, $3);
+	  }
 	| error {
 		$$ = NULL;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.210 2023/07/10 19:58:47 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.211 2023/07/11 20:54:23 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)
-__RCSID("$NetBSD: err.c,v 1.210 2023/07/10 19:58:47 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.211 2023/07/11 20:54:23 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 bool	seen_error;
 bool	seen_warning;
 /* number of syntax errors */
 @@ -99,27 +99,27 @@ static const char *const msgs[] = {
 	"bit-field in union is very unusual",			      /* 41 */
 	"forward reference to enum type",			      /* 42 */
 	"redefinition of '%s' hides earlier one",		      /* 43 */
 	"declaration of '%s %s' introduces new type in ANSI C",	      /* 44 */
 	"base type is really '%s %s'",				      /* 45 */
 	"%s tag '%s' redeclared as %s",				      /* 46 */
 	"zero sized %s is a C99 feature",			      /* 47 */
 	"enumeration value '%s' overflows",			      /* 48 */
 	"anonymous struct/union members is a C11 feature",	      /* 49 */
 	"parameter '%s' has function type, should be pointer",	      /* 50 */
 	"parameter mismatch: %d declared, %d defined",		      /* 51 */
 	"cannot initialize parameter '%s'",			      /* 52 */
 	"declared argument '%s' is missing",			      /* 53 */
-	"trailing ',' prohibited in enum declaration",		      /* 54 */
+	"trailing ',' in enum declaration requires C99 or later",     /* 54 */
 	"integral constant expression expected",		      /* 55 */
 	"integral constant too large",				      /* 56 */
 	"enumeration constant '%s' hides parameter",		      /* 57 */
 	"type of '%s' does not match prototype",		      /* 58 */
 	"formal parameter #%d lacks name",			      /* 59 */
 	"void must be sole parameter",				      /* 60 */
 	"void parameter '%s' cannot have name",			      /* 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 */
 	"",							      /* 66 */
 	"cannot return incomplete type",			      /* 67 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: lint1.h,v 1.184 2023/07/10 19:47:12 rillig Exp $ */
+/* $NetBSD: lint1.h,v 1.185 2023/07/11 20:54:23 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
 @@ -477,32 +477,38 @@ check_printf(const char *fmt, ...)
 	wrap_check_printf_at(message_at, msgid, pos, ##args)
 #  define wrap_check_printf(func, cond, msgid, args...)			\
 	({								\
 		if (/* CONSTCOND */cond)				\
 			debug_step("%s:%d: %s %d '%s' in %s",		\
 			    __FILE__, __LINE__,	#func, msgid,		\
 			    __CONCAT(MSG_, msgid), __func__);		\
 		check_printf(__CONCAT(MSG_, msgid), ##args);		\
 		(func)(msgid, ##args);					\
 		/* LINTED 129 */					\
 	})
-#  define error(msgid, args...) wrap_check_printf(error, true, msgid, ##args)
+#  define error(msgid, args...) wrap_check_printf(error, \
-#  define warning(msgid, args...) wrap_check_printf(warning, true, msgid, ##args)
+    true, msgid, ##args)
-#  define gnuism(msgid, args...) wrap_check_printf(gnuism, !allow_gcc || (!allow_trad && !allow_c99), msgid, ##args)
+#  define warning(msgid, args...) wrap_check_printf(warning, \
-#  define c99ism(msgid, args...) wrap_check_printf(c99ism, !allow_c99 && (!allow_gcc || !allow_trad), msgid, ##args)
+    true, msgid, ##args)
-#  define c11ism(msgid, args...) wrap_check_printf(c11ism, !allow_c11 && !allow_gcc, msgid, ##args)
+#  define gnuism(msgid, args...) wrap_check_printf(gnuism, \
-#  define c23ism(msgid, args...) wrap_check_printf(c23ism, !allow_c23, msgid, ##args)
+    !allow_gcc || (!allow_trad && !allow_c99), msgid, ##args)
 #  define c99ism(msgid, args...) wrap_check_printf(c99ism, \
     !allow_c99 && (!allow_gcc || !allow_trad), msgid, ##args)
 #  define c11ism(msgid, args...) wrap_check_printf(c11ism, \
     !allow_c11 && !allow_gcc, msgid, ##args)
 #  define c23ism(msgid, args...) wrap_check_printf(c23ism, \
     !allow_c23, msgid, ##args)
 #endif
 #ifdef DEBUG
 #  define query_message(query_id, args...)				\
 	do {								\
 		debug_step("%s:%d: query %d '%s' in %s",		\
 		    __FILE__, __LINE__,					\
 		    query_id, __CONCAT(MSG_Q, query_id), __func__);	\
 		check_printf(__CONCAT(MSG_Q, query_id), ##args);	\
 		(query_message)(query_id, ##args);			\
 	} while (false)
 #else
 #  define query_message(...)						\

 @@ -1,13 +1,13 @@
-/*	$NetBSD: decl_enum_c90.c,v 1.2 2022/06/17 18:54:53 rillig Exp $	*/
+/*	$NetBSD: decl_enum_c90.c,v 1.3 2023/07/11 20:54:23 rillig Exp $	*/
 # 3 "decl_enum_c90.c"
 /*
  * Tests for enum declarations in C90 mode.
  */
 /* lint1-flags: -sw */
 enum {
 	A,
 };
-/* expect-1: error: trailing ',' prohibited in enum declaration [54] */
+/* expect-1: error: trailing ',' in enum declaration requires C99 or later [54] */

 @@ -1,13 +1,13 @@
-/*	$NetBSD: msg_054.c,v 1.4 2022/04/16 09:22:25 rillig Exp $	*/
+/*	$NetBSD: msg_054.c,v 1.5 2023/07/11 20:54:23 rillig Exp $	*/
 # 3 "msg_054.c"
-/* Test for message: trailing ',' prohibited in enum declaration [54] */
+/* Test for message: trailing ',' in enum declaration requires C99 or later [54] */
 /* lint1-flags: -sw */
 enum color {
 	RED,
 	GREEN,
 	BLUE,
 };
-/* expect-1: error: trailing ',' prohibited in enum declaration [54] */
+/* expect-1: error: trailing ',' in enum declaration requires C99 or later [54] */