 @@ -1,384 +1,380 @@
-/*	$NetBSD: d_c99_init.c,v 1.24 2021/03/30 14:25:28 rillig Exp $	*/
+/*	$NetBSD: d_c99_init.c,v 1.25 2021/03/30 15:05:05 rillig Exp $	*/
 # 3 "d_c99_init.c"
 /*
  * Test C99 initializers.
+ *
  * See C99 6.7.8 "Initialization".
 */
 void use(const void *);
 typedef struct any {
 	const void *value;
 } any;
 // C99 6.7.8p11 says "optionally enclosed in braces".  There is no limitation
 // on the number of brace pairs.
 int scalar_without_braces = 3;
 int scalar_with_optional_braces = { 3 };
 int scalar_with_too_many_braces = {{ 3 }};
 int scalar_with_too_many_initializers = { 3, 5 };	/* expect: 174 */
 // See init_expr, 'handing over to ASSIGN'.
 void
 struct_initialization_via_assignment(any arg)
+{
 	any local = arg;
 	use(&local);
+}
 // See init_expr, initialization_init_array_using_string.
 char static_duration[] = "static duration";
 signed char static_duration_signed[] = "static duration";
 unsigned char static_duration_unsigned[] = "static duration";
 int static_duration_wchar[] = L"static duration";
 // See init_expr.
 void
 initialization_by_braced_string(void)
+{
 	any local = { "hello" };
 	use(&local);
+}
 void
 initialization_by_redundantly_braced_string(void)
+{
 	any local = {{{{ "hello" }}}};
 	use(&local);
+}
 /*
  * Only scalar expressions and string literals may be enclosed by additional
  * braces.  Since 'arg' is a struct, this is a compile-time error.
  */
 void
 initialization_with_too_many_braces(any arg)
+{
 	any local = { arg };	/* expect: 185 */
 	use(&arg);
+}
 // Some of the following examples are mentioned in the introduction comment
 // in init.c.
 int number = 12345;
 int number_with_braces_and_comma = {
 ,
 };
 int array_with_fixed_size[3] = {
 ,
 ,
 ,
 ,			/* expect: too many array initializers */
 };
 // See initialization_set_set_of_unknown_array.
 int array_of_unknown_size[] = {
 ,
 ,
 ,
 };
 int array_flat[2][2] = {
 ,
 ,
 ,
 };
 int array_nested[2][2] = {
+	{
 ,
 	},
+	{
 ,
+	}
 };
 int array_with_designators[] = {
 	['1'] = 111,
 	['5'] = 555,
 	['9'] = 999
 };
 int array_with_some_designators[] = {
 	['1'] = 111,
 ,
 	['9'] = 999
 };
 struct point {
 	int x;
 	int y;
 };
 struct point point = {
 ,
 };
 struct point point_with_designators = {
 	.y = 4,
 	.x = 3,
 };
 struct point point_with_mixed_designators = {
 	.x = 3,
 ,
 	/* TODO: remove me */
 ,			/* expect: too many struct/union initializers */
 	.x = 3,
 };
 int array_with_designator[] = {
 ,
 	.member = 222,		/* expect: 249 */
 ,
 };
 /*
  * C99 6.7.8p11 says that the initializer of a scalar can be "optionally
  * enclosed in braces".  It does not explicitly set an upper limit on the
  * number of braces.  It also doesn't restrict the term "initializer" to only
  * mean the "outermost initializer".  Both GCC 10 and Clang 8 already warn
  * about this, so there is no extra work for lint to do.
  */
 struct point scalar_with_several_braces = {
 	{{{3}}},
 	{{{{4}}}},
 };
 struct rectangle {
 	struct point top_left;
 	struct point bottom_right;
 };
 /* C99 6.7.8p18 */
 struct rectangle screen = {
 	.bottom_right = {
 ,
 ,
+	}
 };
 /*
  * C99 6.7.8p22 says: At the _end_ of its initializer list, the array no
  * longer has incomplete type.
  */
 struct point points[] = {
+	{
 		/*
 		 * At this point, the size of the object 'points' is not known
 		 * yet since its type is still incomplete.  Lint could warn
 		 * about this, but GCC and Clang already do.
+		 *
 		 * This test case demonstrates that in
 		 * extend_if_array_of_unknown_size, setcomplete is called too
 		 * early.
 		 */
 		sizeof points,
+	}
 };
 struct triangle {
 	struct point points[3];
 };
 struct pentagon {
 	struct point points[5];
 };
 struct geometry {
 	struct pentagon pentagons[6];
 	struct triangle triangles[10];
 	struct point points[3][5][2];
 };
 /*
  * Initialization of a complex struct containing nested arrays and nested
  * structs.
  */
 struct geometry geometry = {
 	/* TODO: remove me */
 	.pentagons[0].points[4].x = 1,
 	.points[0][0][0] = { 0, 0 },
 	.points[2][4][1] = {301, 302 },
 	/* TODO: expect+1: array index 3 must be between 0 and 2 */
 	.points[3][0][0] = {3001, 3002 },
 	/* TODO: expect+1: array index 5 must be between 0 and 4 */
 	.points[0][5][0] = {501, 502 },
 	/* TODO: expect+1: array index 2 must be between 0 and 1 */
 	.points[0][0][2] = {21, 22 },
 };
 struct ends_with_unnamed_bit_field {
 	int member;
 	int : 0;
 } ends_with_unnamed_bit_field = {
 ,
 	/* expect+1: too many struct/union initializers */
 ,
 };
 char prefixed_message[] = {
 	'E', ':', ' ',
 	/* expect+1: illegal combination of integer (char) and pointer */
 	"message\n",
 };
 char message_with_suffix[] = {
 	"message",		/* expect: illegal combination */
 	/* */
 	'\n',
 };
 struct ten {
 	int i0;
 	int i1;
 	int i2;
 	int i3;
 	int i4;
 	int i5;
 	int i6;
 	int i7;
 	int i8;
 	int i9;
 };
 struct ten ten = {
 	.i3 = 3,
 ,
-	// FIXME: assertion "level->bl_type->t_tspec == ARRAY" failed in brace_level_extend_if_array_of_unknown_size
+,
-	// 5,
+,
 	// 6,
 };
 int c99_6_7_8_p26_example3[4][3] = {
 	{ 1, 3, 5 },
 	{ 2, 4, 6 },
 	{ 3, 5, 7 },
 };
 int c99_6_7_8_p27_example4[4][3] = {
 	{ 1 }, { 2 }, { 3 }, { 4 }
 };
 struct {
 	int a[3], b;
 } c99_6_7_8_p28_example5[] = {
 	{ 1 },
 ,			/* XXX *//* expect: cannot initialize */
 };
 short c99_6_7_8_p29_example6a[4][3][2] = {
 	{ 1 },
 	{ 2, 3 },
 	{ 4, 5, 6 },
 };
 short c99_6_7_8_p29_example6b[4][3][2] = {
 , 0, 0, 0, 0, 0,
 , 3, 0, 0, 0, 0,
 , 5, 6, 0, 0, 0,
 };
 short c99_6_7_8_p29_example6c[4][3][2] = {
+	{
 		{ 1 },
 	},
+	{
 		{ 2, 3 },
 	},
+	{
 		{ 4, 5 },
 		{ 6 },
+	}
 };
 /*
  * During initialization of an object of type array of unknown size, the type
  * information on the symbol is updated in-place.  Ensure that this happens on
  * a copy of the type.
  */
 void
 ensure_array_type_is_not_modified_during_initialization(void)
+{
 	typedef int array_of_unknown_size[];
 	array_of_unknown_size a1 = { 1, 2, 3};
 	switch (4) {
 	case sizeof(array_of_unknown_size):
 	case 0:			/* expect: duplicate case in switch: 0 */
 	case 3:
 	case 4:
 	case 12:
 		break;
+	}
+}
 struct point unknown_member_name_beginning = {
 	/* TODO: remove me */
 	.r = 5,			/* expect: undefined struct/union member: r */
 	.x = 4,
 	.y = 3,
 };
 struct point unknown_member_name_middle = {
 	.x = 4,
 	.r = 5,			/* expect: undefined struct/union member: r */
 	.y = 3,
 };
 struct point unknown_member_name_end = {
 	.x = 4,
 	.y = 3,
 	.r = 5,			/* expect: undefined struct/union member: r */
 };
 union value {
 	int int_value;
 	void *pointer_value;
 };
 union value unknown_union_member_name_first = {
 	/* TODO: remove me */
 	.unknown_value = 4,	/* expect: undefined struct/union member */
 	.int_value = 3,
 };
 union value unknown_union_member_name_second = {
 	.int_value = 3,
 	/* TODO: remove me */
 	.unknown_value = 4,	/* expect: undefined struct/union member */
 };
 struct point designators_with_subscript = {
 	[0] = 3,		/* expect: only for arrays */
 	.member[0][0].member = 4, /* expect: undefined struct/union member */
 	.x.y.z = 5,	/* intentionally not caught, see designator_look_up */
 };
 struct {
 	int : 16;
 } struct_with_only_unnamed_members = {	/* expect: has no named members */
 ,		/* expect: too many struct/union initializers */
 };
 union {
 	int : 16;
 } union_with_only_unnamed_members = {	/* expect: has no named members */
 ,		/* expect: too many struct/union initializers */
 };

 @@ -1,77 +1,77 @@
-/*	$NetBSD: msg_247.c,v 1.7 2021/03/26 16:59:19 rillig Exp $	*/
+/*	$NetBSD: msg_247.c,v 1.8 2021/03/30 15:05:05 rillig Exp $	*/
 # 3 "msg_247.c"
 // Test for message: pointer cast from '%s' to '%s' may be troublesome [247]
 /* lint1-extra-flags: -c */
 /* example taken from Xlib.h */
 typedef struct {
 	int id;
 } *PDisplay;
 struct Other {
 	int id;
 };
 void
 example(struct Other *arg)
+{
 	PDisplay display;
 	/*
 	 * XXX: The target type is reported as 'struct <unnamed>'.  In cases
 	 *  like these, it would be helpful to print at least the type name
 	 *  of the pointer.  This type name though is discarded immediately
 	 *  when the parser reduces 'T_TYPENAME clrtyp' to 'clrtyp_typespec'.
 	 *  After that, the target type of the cast is just an unnamed struct,
 	 *  with no hint at all that there is a typedef for a pointer to the
 	 *  struct.
 	 */
 	display = (PDisplay)arg;	/* expect: 247 */
+}
 /*
  * C code with a long history that has existed in pre-C90 times already often
  * uses 'pointer to char' where modern code would use 'pointer to void'.
  * Since 'char' is the most general underlying type, there is nothing wrong
  * with casting to it.  An example for this type of code is X11.
+ *
  * Casting to 'pointer to char' may also be used by programmers who don't know
  * about endianness, but that's not something lint can do anything about.  The
  * code for these two use cases looks exactly the same, so lint errs on the
- * side of fewer false positive warnings here. (after fixing the FIXME below)
+ * side of fewer false positive warnings here.
  */
 char *
 cast_to_char_pointer(struct Other *arg)
+{
 	return (char *)arg;
+}
 /*
  * In traditional C there was 'unsigned char' as well, so the same reasoning
  * as for plain 'char' applies here.
  */
 unsigned char *
 cast_to_unsigned_char_pointer(struct Other *arg)
+{
 	return (unsigned char *)arg;
+}
 /*
  * Traditional C does not have the type specifier 'signed', which means that
  * this type cannot be used by old code.  Therefore warn about this.  All code
  * that triggers this warning should do the intermediate cast via 'void
  * pointer'.
  */
 signed char *
 cast_to_signed_char_pointer(struct Other *arg)
+{
 	return (signed char *)arg;	/* expect: 247 */
+}
 char *
 cast_to_void_pointer_then_to_char_pointer(struct Other *arg)
+{
 	return (char *)(void *)arg;
+}

 @@ -1,21 +1,21 @@
 d_c99_init.c(23): error: too many initializers [174]
 d_c99_init.c(63): error: cannot initialize 'pointer to const void' from 'struct any' [185]
 d_c99_init.c(80): error: too many array initializers, expected 3 [173]
 d_c99_init.c(139): error: too many struct/union initializers [172]
 d_c99_init.c(145): error: syntax error 'named member must only be used with struct/union' [249]
 d_c99_init.c(232): error: too many struct/union initializers [172]
 d_c99_init.c(238): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
 d_c99_init.c(242): warning: illegal combination of integer (char) and pointer (pointer to char) [183]
-d_c99_init.c(282): error: cannot initialize 'struct <unnamed>' from 'int' [185]
+d_c99_init.c(281): error: cannot initialize 'struct <unnamed>' from 'int' [185]
-d_c99_init.c(324): error: duplicate case in switch: 0 [199]
+d_c99_init.c(323): error: duplicate case in switch: 0 [199]
-d_c99_init.c(334): error: undefined struct/union member: r [101]
+d_c99_init.c(332): error: undefined struct/union member: r [101]
-d_c99_init.c(341): error: undefined struct/union member: r [101]
+d_c99_init.c(339): error: undefined struct/union member: r [101]
-d_c99_init.c(348): error: undefined struct/union member: r [101]
+d_c99_init.c(346): error: undefined struct/union member: r [101]
-d_c99_init.c(358): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(355): error: undefined struct/union member: unknown_value [101]
-d_c99_init.c(365): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(361): error: undefined struct/union member: unknown_value [101]
-d_c99_init.c(369): error: syntax error 'designator '[...]' is only for arrays' [249]
+d_c99_init.c(365): error: syntax error 'designator '[...]' is only for arrays' [249]
-d_c99_init.c(370): error: undefined struct/union member: member [101]
+d_c99_init.c(366): error: undefined struct/union member: member [101]
-d_c99_init.c(376): warning: structure has no named members [65]
+d_c99_init.c(372): warning: structure has no named members [65]
-d_c99_init.c(377): error: too many struct/union initializers [172]
+d_c99_init.c(373): error: too many struct/union initializers [172]
-d_c99_init.c(382): warning: union has no named members [65]
+d_c99_init.c(378): warning: union has no named members [65]
-d_c99_init.c(383): error: too many struct/union initializers [172]
+d_c99_init.c(379): error: too many struct/union initializers [172]