Module Name: src
Committed By: rillig
Date: Wed Apr 14 18:27:11 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh
src/usr.bin/xlint/lint1: cgram.y
Added Files:
src/tests/usr.bin/xlint/lint1: msg_343.c msg_343.exp
Log Message:
lint: add test for newly added message about static array size
To generate a diff of this commit:
cvs rdiff -u -r1.1039 -r1.1040 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.41 -r1.42 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/msg_343.c \
src/tests/usr.bin/xlint/lint1/msg_343.exp
cvs rdiff -u -r1.40 -r1.41 src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r1.214 -r1.215 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1039 src/distrib/sets/lists/tests/mi:1.1040
--- src/distrib/sets/lists/tests/mi:1.1039 Fri Apr 9 21:07:39 2021
+++ src/distrib/sets/lists/tests/mi Wed Apr 14 18:27:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1039 2021/04/09 21:07:39 rillig Exp $
+# $NetBSD: mi,v 1.1040 2021/04/14 18:27:11 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6870,6 +6870,8 @@
./usr/tests/usr.bin/xlint/lint1/msg_341.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/msg_342.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/msg_342.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_343.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/msg_343.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/op_colon.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/op_colon.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/t_integration tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.41 src/tests/usr.bin/xlint/lint1/Makefile:1.42
--- src/tests/usr.bin/xlint/lint1/Makefile:1.41 Fri Apr 9 21:07:39 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Wed Apr 14 18:27:11 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2021/04/09 21:07:39 rillig Exp $
+# $NetBSD: Makefile,v 1.42 2021/04/14 18:27:11 rillig Exp $
NOMAN= # defined
-MAX_MESSAGE= 342 # see lint1/err.c
+MAX_MESSAGE= 343 # see lint1/err.c
.include <bsd.own.mk>
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.40 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.41
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.40 Thu Apr 8 22:18:27 2021
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Wed Apr 14 18:27:11 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.40 2021/04/08 22:18:27 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.41 2021/04/14 18:27:11 rillig Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -177,7 +177,7 @@ all_messages_body()
failed=""
- for msg in $(seq 0 342); do
+ for msg in $(seq 0 343); do
name="$(printf 'msg_%03d.c' "${msg}")"
check_lint1 "${name}" \
|| failed="$failed${failed:+ }$name"
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.214 src/usr.bin/xlint/lint1/cgram.y:1.215
--- src/usr.bin/xlint/lint1/cgram.y:1.214 Wed Apr 14 13:34:08 2021
+++ src/usr.bin/xlint/lint1/cgram.y Wed Apr 14 18:27:11 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.214 2021/04/14 13:34:08 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.215 2021/04/14 18:27:11 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.214 2021/04/14 13:34:08 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.215 2021/04/14 18:27:11 rillig Exp $");
#endif
#include <limits.h>
@@ -1137,9 +1137,10 @@ array_size:
/* C99 6.7.6.3 */
if ($1 != STATIC)
yyerror("Bad attribute");
+ /* static array size is a C99 extension */
c99ism(343);
$$ = $2;
- }
+ }
| constant_expr {
$$ = $1;
}
Added files:
Index: src/tests/usr.bin/xlint/lint1/msg_343.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/msg_343.c:1.1
--- /dev/null Wed Apr 14 18:27:11 2021
+++ src/tests/usr.bin/xlint/lint1/msg_343.c Wed Apr 14 18:27:11 2021
@@ -0,0 +1,39 @@
+/* $NetBSD: msg_343.c,v 1.1 2021/04/14 18:27:11 rillig Exp $ */
+# 3 "msg_343.c"
+
+/* Test for message: static array size is a C99 extension [343] */
+
+/* lint1-flags: -sw */
+
+void takes_int_pointer(int []);
+void takes_int_pointer_with_ignored_size(int [3]);
+void takes_int_array(int[static 3]); /* expect: 343 */
+/* expect+1: syntax error 'volatile' */
+void takes_volatile_int_array(int[volatile 3]);
+
+int
+returns_int_pointer(int a[])
+{
+ return a[0];
+}
+
+int
+returns_int_pointer_with_ignored_size(int a[3])
+{
+ return a[0];
+}
+
+int
+returns_int_array(int a[static 3]) /* expect: 343 */
+{
+ return a[0];
+}
+
+int
+/* expect+1: syntax error 'volatile' */
+returns_volatile_int_array(int a[volatile 3])
+{
+ /* expect+2: cannot dereference non-pointer type */
+ /* expect+1: expects to return value */
+ return a[0];
+}
Index: src/tests/usr.bin/xlint/lint1/msg_343.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/msg_343.exp:1.1
--- /dev/null Wed Apr 14 18:27:11 2021
+++ src/tests/usr.bin/xlint/lint1/msg_343.exp Wed Apr 14 18:27:11 2021
@@ -0,0 +1,6 @@
+msg_343.c(10): error: static array size is a C99 extension [343]
+msg_343.c(12): error: syntax error 'volatile' [249]
+msg_343.c(27): error: static array size is a C99 extension [343]
+msg_343.c(34): error: syntax error 'volatile' [249]
+msg_343.c(38): error: cannot dereference non-pointer type [96]
+msg_343.c(38): warning: function returns_volatile_int_array expects to return value [214]
