Module Name: src
Committed By: rillig
Date: Fri Jul 2 23:29:54 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: c99_init_array.c c99_init_array.exp
Log Message:
tests/lint: encode the array length in the diagnostic
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/c99_init_array.c \
src/tests/usr.bin/xlint/lint1/c99_init_array.exp
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/c99_init_array.c
diff -u src/tests/usr.bin/xlint/lint1/c99_init_array.c:1.2 src/tests/usr.bin/xlint/lint1/c99_init_array.c:1.3
--- src/tests/usr.bin/xlint/lint1/c99_init_array.c:1.2 Fri Jul 2 22:46:43 2021
+++ src/tests/usr.bin/xlint/lint1/c99_init_array.c Fri Jul 2 23:29:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c99_init_array.c,v 1.2 2021/07/02 22:46:43 rillig Exp $ */
+/* $NetBSD: c99_init_array.c,v 1.3 2021/07/02 23:29:54 rillig Exp $ */
# 3 "c99_init_array.c"
/*
@@ -10,10 +10,10 @@
// The size of the array is determined by the maximum index, not by the last
// one mentioned.
int arr_11[] = { [10] = 10, [0] = 0 };
-typedef int ctassert_11[sizeof(arr_11) / sizeof(arr_11[0]) == 11 ? -1 : 1];
-/* expect-1: error: negative array dimension (-1) [20] */
+typedef int ctassert_11[-(int)(sizeof(arr_11) / sizeof(arr_11[0]))];
+/* expect-1: error: negative array dimension (-11) [20] */
// Without an explicit subscript designator, the subscript counts up.
int arr_3[] = { [1] = 1, [0] = 0, 1, 2 };
-typedef int ctassert_3[sizeof(arr_3) / sizeof(arr_3[0]) == 3 ? -1 : 1];
-/* expect-1: error: negative array dimension (-1) [20] */
+typedef int ctassert_3[-(int)(sizeof(arr_3) / sizeof(arr_3[0]))];
+/* expect-1: error: negative array dimension (-3) [20] */
Index: src/tests/usr.bin/xlint/lint1/c99_init_array.exp
diff -u src/tests/usr.bin/xlint/lint1/c99_init_array.exp:1.2 src/tests/usr.bin/xlint/lint1/c99_init_array.exp:1.3
--- src/tests/usr.bin/xlint/lint1/c99_init_array.exp:1.2 Fri Jul 2 22:46:43 2021
+++ src/tests/usr.bin/xlint/lint1/c99_init_array.exp Fri Jul 2 23:29:54 2021
@@ -1,2 +1,2 @@
-c99_init_array.c(13): error: negative array dimension (-1) [20]
-c99_init_array.c(18): error: negative array dimension (-1) [20]
+c99_init_array.c(13): error: negative array dimension (-11) [20]
+c99_init_array.c(18): error: negative array dimension (-3) [20]
