Module Name:    src
Committed By:   rillig
Date:           Sun Jun 20 18:09:48 UTC 2021

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/usr.bin/xlint/lint1: Makefile t_integration.sh
Added Files:
        src/tests/usr.bin/xlint/lint1: c99_init_designator.c
            c99_init_designator.exp

Log Message:
tests/lint: test syntax error in initialization using designator

This test prepares the upcoming refactoring of the grammar.


To generate a diff of this commit:
cvs rdiff -u -r1.1062 -r1.1063 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.64 -r1.65 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/c99_init_designator.c \
    src/tests/usr.bin/xlint/lint1/c99_init_designator.exp
cvs rdiff -u -r1.56 -r1.57 src/tests/usr.bin/xlint/lint1/t_integration.sh

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.1062 src/distrib/sets/lists/tests/mi:1.1063
--- src/distrib/sets/lists/tests/mi:1.1062	Sat Jun 19 20:25:57 2021
+++ src/distrib/sets/lists/tests/mi	Sun Jun 20 18:09:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1062 2021/06/19 20:25:57 rillig Exp $
+# $NetBSD: mi,v 1.1063 2021/06/20 18:09:48 rillig Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6105,6 +6105,8 @@
 ./usr/tests/usr.bin/xlint/lint1				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/Atffile				tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/Kyuafile			tests-usr.bin-tests	compattestfile,atf,kyua
+./usr/tests/usr.bin/xlint/lint1/c99_init_designator.c		tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/c99_init_designator.exp		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_alignof.c			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_bltinoffsetof.c		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c		tests-usr.bin-tests	compattestfile,atf

Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.64 src/tests/usr.bin/xlint/lint1/Makefile:1.65
--- src/tests/usr.bin/xlint/lint1/Makefile:1.64	Sat Jun 19 20:25:58 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile	Sun Jun 20 18:09:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2021/06/19 20:25:58 rillig Exp $
+# $NetBSD: Makefile,v 1.65 2021/06/20 18:09:48 rillig Exp $
 
 NOMAN=		# defined
 MAX_MESSAGE=	344		# see lint1/err.c
@@ -10,6 +10,8 @@ TESTSDIR=	${TESTSBASE}/usr.bin/xlint/lin
 TESTS_SH=	t_integration
 
 FILESDIR=	${TESTSDIR}
+FILES+=		c99_init_designator.c
+FILES+=		c99_init_designator.exp
 FILES+=		d_alignof.c
 FILES+=		d_bltinoffsetof.c
 FILES+=		d_c99_bool.c

Index: src/tests/usr.bin/xlint/lint1/t_integration.sh
diff -u src/tests/usr.bin/xlint/lint1/t_integration.sh:1.56 src/tests/usr.bin/xlint/lint1/t_integration.sh:1.57
--- src/tests/usr.bin/xlint/lint1/t_integration.sh:1.56	Sat Jun 19 20:25:58 2021
+++ src/tests/usr.bin/xlint/lint1/t_integration.sh	Sun Jun 20 18:09:48 2021
@@ -1,4 +1,4 @@
-# $NetBSD: t_integration.sh,v 1.56 2021/06/19 20:25:58 rillig Exp $
+# $NetBSD: t_integration.sh,v 1.57 2021/06/20 18:09:48 rillig Exp $
 #
 # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -99,6 +99,7 @@ test_case()
 
 
 test_case all_messages
+test_case c99_init_designator
 test_case d_alignof
 test_case d_bltinoffsetof
 test_case d_c99_anon_struct

Added files:

Index: src/tests/usr.bin/xlint/lint1/c99_init_designator.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/c99_init_designator.c:1.1
--- /dev/null	Sun Jun 20 18:09:48 2021
+++ src/tests/usr.bin/xlint/lint1/c99_init_designator.c	Sun Jun 20 18:09:48 2021
@@ -0,0 +1,28 @@
+/*	$NetBSD: c99_init_designator.c,v 1.1 2021/06/20 18:09:48 rillig Exp $	*/
+# 3 "c99_init_designator.c"
+
+/*
+ * Test initialization of structs or unions using designators.
+ *
+ * See init.c, 'struct designator' and 'struct designation'.
+ *
+ * C99 6.7.8p6, 6.7.8p7
+ */
+
+struct point {
+	int x;
+	int y;
+};
+
+/*
+ * Before cgram.y 1.230 from 2021-06-20, the grammar allowed either of the
+ * operators '.' or '->' to be used for the designators and had extra code
+ * to ensure that only '.' was actually used.
+ */
+struct point origin = {
+    .x = 0,
+    ->y = 0,			/* expect: syntax error '->' */
+};
+
+/* Ensure that the parser can recover from the parse error. */
+struct point pythagoras = { 3, 4 };
Index: src/tests/usr.bin/xlint/lint1/c99_init_designator.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/c99_init_designator.exp:1.1
--- /dev/null	Sun Jun 20 18:09:48 2021
+++ src/tests/usr.bin/xlint/lint1/c99_init_designator.exp	Sun Jun 20 18:09:48 2021
@@ -0,0 +1 @@
+c99_init_designator.c(24): error: syntax error '->' [249]

Reply via email to