Module Name: src
Committed By: rillig
Date: Tue Jul 11 20:54:23 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_enum_c90.c msg_054.c
src/usr.bin/xlint/lint1: cgram.y err.c lint1.h
Log Message:
lint: update wording in diagnostic for C99
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl_enum_c90.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_054.c
cvs rdiff -u -r1.452 -r1.453 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.210 -r1.211 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.184 -r1.185 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_enum_c90.c
diff -u src/tests/usr.bin/xlint/lint1/decl_enum_c90.c:1.2 src/tests/usr.bin/xlint/lint1/decl_enum_c90.c:1.3
--- src/tests/usr.bin/xlint/lint1/decl_enum_c90.c:1.2 Fri Jun 17 18:54:53 2022
+++ src/tests/usr.bin/xlint/lint1/decl_enum_c90.c Tue Jul 11 20:54:23 2023
@@ -1,4 +1,4 @@
-/* $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"
/*
@@ -10,4 +10,4 @@
enum {
A,
};
-/* expect-1: error: trailing ',' prohibited in enum declaration [54] */
+/* expect-1: error: trailing ',' in enum declaration requires C99 or later [54] */
Index: src/tests/usr.bin/xlint/lint1/msg_054.c
diff -u src/tests/usr.bin/xlint/lint1/msg_054.c:1.4 src/tests/usr.bin/xlint/lint1/msg_054.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_054.c:1.4 Sat Apr 16 09:22:25 2022
+++ src/tests/usr.bin/xlint/lint1/msg_054.c Tue Jul 11 20:54:23 2023
@@ -1,7 +1,7 @@
-/* $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 */
@@ -10,4 +10,4 @@ enum color {
GREEN,
BLUE,
};
-/* expect-1: error: trailing ',' prohibited in enum declaration [54] */
+/* expect-1: error: trailing ',' in enum declaration requires C99 or later [54] */
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.452 src/usr.bin/xlint/lint1/cgram.y:1.453
--- src/usr.bin/xlint/lint1/cgram.y:1.452 Mon Jul 10 19:58:47 2023
+++ src/usr.bin/xlint/lint1/cgram.y Tue Jul 11 20:54:23 2023
@@ -1,5 +1,5 @@
%{
-/* $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.
@@ -35,7 +35,7 @@
#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>
@@ -1166,10 +1166,10 @@ enums_with_opt_comma: /* helper for C99
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;
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.210 src/usr.bin/xlint/lint1/err.c:1.211
--- src/usr.bin/xlint/lint1/err.c:1.210 Mon Jul 10 19:58:47 2023
+++ src/usr.bin/xlint/lint1/err.c Tue Jul 11 20:54:23 2023
@@ -1,4 +1,4 @@
-/* $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
@@ -37,7 +37,7 @@
#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>
@@ -109,7 +109,7 @@ static const char *const msgs[] = {
"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 */
Index: src/usr.bin/xlint/lint1/lint1.h
diff -u src/usr.bin/xlint/lint1/lint1.h:1.184 src/usr.bin/xlint/lint1/lint1.h:1.185
--- src/usr.bin/xlint/lint1/lint1.h:1.184 Mon Jul 10 19:47:12 2023
+++ src/usr.bin/xlint/lint1/lint1.h Tue Jul 11 20:54:23 2023
@@ -1,4 +1,4 @@
-/* $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.
@@ -487,12 +487,18 @@ check_printf(const char *fmt, ...)
/* LINTED 129 */ \
})
-# define error(msgid, args...) wrap_check_printf(error, true, msgid, ##args)
-# define warning(msgid, args...) wrap_check_printf(warning, true, msgid, ##args)
-# define gnuism(msgid, args...) wrap_check_printf(gnuism, !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)
+# define error(msgid, args...) wrap_check_printf(error, \
+ true, msgid, ##args)
+# define warning(msgid, args...) wrap_check_printf(warning, \
+ true, msgid, ##args)
+# define gnuism(msgid, args...) wrap_check_printf(gnuism, \
+ !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
