Module Name: src
Committed By: njoly
Date: Tue Feb 4 08:08:59 UTC 2014
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: d_c99_decls_after_stmt3.c
Log Message:
Handle another declaration after statement case for lint in c99 mode.
Add the corresponding testcase.
To generate a diff of this commit:
cvs rdiff -u -r1.561 -r1.562 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/Makefile \
src/tests/usr.bin/xlint/lint1/t_integration.sh
cvs rdiff -u -r0 -r1.1 \
src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
cvs rdiff -u -r1.56 -r1.57 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.561 src/distrib/sets/lists/tests/mi:1.562
--- src/distrib/sets/lists/tests/mi:1.561 Sat Feb 1 20:49:11 2014
+++ src/distrib/sets/lists/tests/mi Tue Feb 4 08:08:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.561 2014/02/01 20:49:11 jmmv Exp $
+# $NetBSD: mi,v 1.562 2014/02/04 08:08:59 njoly Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3101,6 +3101,7 @@
./usr/tests/usr.bin/xlint/lint1/d_c99_complex_num.c tests-usr.bin-tests atf
./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt.c tests-usr.bin-tests atf
./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt2.c tests-usr.bin-tests atf
+./usr/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c tests-usr.bin-tests atf
./usr/tests/usr.bin/xlint/lint1/d_c99_for_loops.c tests-usr.bin-tests atf
./usr/tests/usr.bin/xlint/lint1/d_c99_func.c tests-usr.bin-tests atf
./usr/tests/usr.bin/xlint/lint1/d_c99_recursive_init.c tests-usr.bin-tests atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.1 src/tests/usr.bin/xlint/lint1/Makefile:1.2
--- src/tests/usr.bin/xlint/lint1/Makefile:1.1 Sat Mar 17 16:33:15 2012
+++ src/tests/usr.bin/xlint/lint1/Makefile Tue Feb 4 08:08:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2012/03/17 16:33:15 jruoho Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/04 08:08:59 njoly Exp $
NOMAN= # defined
@@ -13,6 +13,7 @@ FILES+= d_alignof.c
FILES+= d_c99_complex_num.c
FILES+= d_c99_decls_after_stmt.c
FILES+= d_c99_decls_after_stmt2.c
+FILES+= d_c99_decls_after_stmt3.c
FILES+= d_c99_for_loops.c
FILES+= d_c99_func.c
FILES+= d_c99_recursive_init.c
Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.1 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.2
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.1 Sat Mar 17 16:33:16 2012
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh Tue Feb 4 08:08:59 2014
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.1 2012/03/17 16:33:16 jruoho Exp $
+# $NetBSD: t_integration.sh,v 1.2 2014/02/04 08:08:59 njoly Exp $
#
# Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -82,6 +82,7 @@ test_case check_valid gcc_variable_array
"initializers"
test_case check_valid c9x_array_init "Checks C9X array initializers"
test_case check_valid c99_decls_after_stmt "Checks C99 decls after statements"
+test_case check_valid c99_decls_after_stmt3 "Checks C99 decls after statements"
test_case check_valid nolimit_init "Checks no limit initializers"
test_case check_valid zero_sized_arrays "Checks zero sized arrays"
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.56 src/usr.bin/xlint/lint1/cgram.y:1.57
--- src/usr.bin/xlint/lint1/cgram.y:1.56 Thu Jan 16 00:43:43 2014
+++ src/usr.bin/xlint/lint1/cgram.y Tue Feb 4 08:08:59 2014
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.56 2014/01/16 00:43:43 christos Exp $ */
+/* $NetBSD: cgram.y,v 1.57 2014/02/04 08:08:59 njoly 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.56 2014/01/16 00:43:43 christos Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.57 2014/02/04 08:08:59 njoly Exp $");
#endif
#include <stdlib.h>
@@ -1340,7 +1340,7 @@ stmnt_d_list:
comp_stmnt:
comp_stmnt_lbrace comp_stmnt_rbrace
- | comp_stmnt_lbrace stmnt_list comp_stmnt_rbrace
+ | comp_stmnt_lbrace stmnt_d_list comp_stmnt_rbrace
| comp_stmnt_lbrace declaration_list comp_stmnt_rbrace
| comp_stmnt_lbrace declaration_list stmnt_d_list comp_stmnt_rbrace
;
Added files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c:1.1
--- /dev/null Tue Feb 4 08:08:59 2014
+++ src/tests/usr.bin/xlint/lint1/d_c99_decls_after_stmt3.c Tue Feb 4 08:08:59 2014
@@ -0,0 +1,5 @@
+void sample(int i)
+{
+ i += 1;
+ int j = 0; j += 1;
+}
