 @@ -1,14 +1,14 @@
-/*	$NetBSD: d_c99_init.c,v 1.25 2021/03/30 15:05:05 rillig Exp $	*/
+/*	$NetBSD: d_c99_init.c,v 1.26 2021/03/30 15:18:19 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;
 @@ -319,61 +319,61 @@ ensure_array_type_is_not_modified_during
 	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 = {
-	.r = 5,			/* expect: undefined struct/union member: r */
+	.r = 5,			/* expect: does not have member 'r' */
 	.x = 4,
 	.y = 3,
 };
 struct point unknown_member_name_middle = {
 	.x = 4,
-	.r = 5,			/* expect: undefined struct/union member: r */
+	.r = 5,			/* expect: does not have member 'r' */
 	.y = 3,
 };
 struct point unknown_member_name_end = {
 	.x = 4,
 	.y = 3,
-	.r = 5,			/* expect: undefined struct/union member: r */
+	.r = 5,			/* expect: does not have member 'r' */
 };
 union value {
 	int int_value;
 	void *pointer_value;
 };
 union value unknown_union_member_name_first = {
-	.unknown_value = 4,	/* expect: undefined struct/union member */
+	.unknown_value = 4,	/* expect: does not have member */
 	.int_value = 3,
 };
 union value unknown_union_member_name_second = {
 	.int_value = 3,
-	.unknown_value = 4,	/* expect: undefined struct/union member */
+	.unknown_value = 4,	/* expect: does not have member */
 };
 struct point designators_with_subscript = {
 	[0] = 3,		/* expect: only for arrays */
-	.member[0][0].member = 4, /* expect: undefined struct/union member */
+	.member[0][0].member = 4, /* expect: does not have member '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,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 'designator '.member' is only for 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(281): error: cannot initialize 'struct <unnamed>' from 'int' [185]
 d_c99_init.c(323): error: duplicate case in switch: 0 [199]
-d_c99_init.c(332): error: undefined struct/union member: r [101]
+d_c99_init.c(332): error: type 'struct point' does not have member 'r' [101]
-d_c99_init.c(339): error: undefined struct/union member: r [101]
+d_c99_init.c(339): error: type 'struct point' does not have member 'r' [101]
-d_c99_init.c(346): error: undefined struct/union member: r [101]
+d_c99_init.c(346): error: type 'struct point' does not have member 'r' [101]
-d_c99_init.c(355): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(355): error: type 'union value' does not have member 'unknown_value' [101]
-d_c99_init.c(361): error: undefined struct/union member: unknown_value [101]
+d_c99_init.c(361): error: type 'union value' does not have member 'unknown_value' [101]
 d_c99_init.c(365): error: syntax error 'designator '[...]' is only for arrays' [249]
-d_c99_init.c(366): error: undefined struct/union member: member [101]
+d_c99_init.c(366): error: type 'struct point' does not have member 'member' [101]
 d_c99_init.c(372): warning: structure has no named members [65]
 d_c99_init.c(373): error: too many struct/union initializers [172]
 d_c99_init.c(378): warning: union has no named members [65]
 d_c99_init.c(379): error: too many struct/union initializers [172]

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.98 2021/03/30 15:07:53 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.99 2021/03/30 15:18:19 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.98 2021/03/30 15:07:53 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.99 2021/03/30 15:18:19 rillig Exp $");
 #endif
 #include <sys/types.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "lint1.h"
 /* number of errors found */
 int	nerr;
 /* number of syntax errors */
 int	sytxerr;
 @@ -145,27 +145,27 @@ const	char *msgs[] = {
 	"typedef hides external declaration: %s",		      /* 88 */
 	"typedef redeclared: %s",				      /* 89 */
 	"inconsistent redeclaration of extern: %s",		      /* 90 */
 	"declaration hides parameter: %s",			      /* 91 */
 	"inconsistent redeclaration of static: %s",		      /* 92 */
 	"dubious static function at block level: %s",		      /* 93 */
 	"function has illegal storage class: %s",		      /* 94 */
 	"declaration hides earlier one: %s",			      /* 95 */
 	"cannot dereference non-pointer type",			      /* 96 */
 	"suffix U is illegal in traditional C",			      /* 97 */
 	"suffixes F and L are illegal in traditional C",	      /* 98 */
 	"'%s' undefined",					      /* 99 */
 	"unary + is illegal in traditional C",			      /* 100 */
-	"undefined struct/union member: %s",			      /* 101 */
+	"type '%s' does not have member '%s'",			      /* 101 */
 	"illegal member use: %s",				      /* 102 */
 	"left operand of '.' must be struct/union object",	      /* 103 */
 	"left operand of '->' must be pointer to struct/union not %s",/* 104 */
 	"non-unique member requires struct/union %s",		      /* 105 */
 	"left operand of '->' must be pointer",			      /* 106 */
 	"operands of '%s' have incompatible types (%s != %s)",	      /* 107 */
 	"operand of '%s' has invalid type (%s)",		      /* 108 */
 	"void type illegal in expression",			      /* 109 */
 	"pointer to function is not allowed here",		      /* 110 */
 	"unacceptable operand of '%s'",				      /* 111 */
 	"cannot take address of bit-field",			      /* 112 */
 	"cannot take address of register %s",			      /* 113 */
 	"%soperand of '%s' must be lvalue",			      /* 114 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.181 2021/03/30 15:10:46 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.182 2021/03/30 15:18:19 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * Copyright (c) 2021 Roland Illig
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -28,27 +28,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.181 2021/03/30 15:10:46 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.182 2021/03/30 15:18:19 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization of global or local objects, like in:
+ *
  *	int number = 12345;
  *	int number_with_braces = { 12345 };
 @@ -296,29 +296,28 @@ static const type_t *
 sym_type(const sym_t *sym)
+{
 	return sym != NULL ? sym->s_type : NULL;
+}
 static const type_t *
 look_up_member_type(const type_t *tp, const char *name)
+{
 	const sym_t *member;
 	member = look_up_member(tp, name);
 	if (member == NULL) {
-		/* TODO: add type information */
+		/* type '%s' does not have member '%s' */
-		/* undefined struct/union member: %s */
+		error(101, type_name(tp), name);
 		error(101, name);
+	}
 	return sym_type(member);
+}
 static void
 update_type_of_array_of_unknown_size(sym_t *sym, size_t size)
+{
 	type_t *tp;
 	tp = duptyp(sym->s_type);
 	tp->t_dim = (int)size;
 	tp->t_incomplete_array = false;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.253 2021/03/28 13:09:43 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.254 2021/03/30 15:18:19 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.253 2021/03/28 13:09:43 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.254 2021/03/30 15:18:19 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*new_integer_constant_node(tspec_t, int64_t);
 @@ -337,28 +337,28 @@ sym_t *
 struct_or_union_member(tnode_t *tn, op_t op, sym_t *msym)
+{
 	struct_or_union	*str;
 	type_t	*tp;
 	sym_t	*sym, *csym;
 	bool	eq;
 	tspec_t	t;
 	/*
 	 * Remove the member if it was unknown until now, which means
 	 * that no defined struct or union has a member with the same name.
 	 */
 	if (msym->s_scl == NOSCL) {
-		/* undefined struct/union member: %s */
+		/* type '%s' does not have member '%s' */
-		error(101, msym->s_name);
+		error(101, type_name(msym->s_type), msym->s_name);
 		rmsym(msym);
 		msym->s_kind = FMEMBER;
 		msym->s_scl = MOS;
 		msym->s_styp = tgetblk(sizeof *msym->s_styp);
 		msym->s_styp->sou_tag = tgetblk(sizeof *msym->s_styp->sou_tag);
 		msym->s_styp->sou_tag->s_name = unnamed;
 		msym->s_value.v_tspec = INT;
 		return msym;
+	}
 	/* Set str to the tag of which msym is expected to be a member. */
 	str = NULL;
 	t = (tp = tn->tn_type)->t_tspec;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_101.c,v 1.3 2021/01/31 11:12:07 rillig Exp $	*/
+/*	$NetBSD: msg_101.c,v 1.4 2021/03/30 15:18:19 rillig Exp $	*/
 # 3 "msg_101.c"
-// Test for message: undefined struct/union member: %s [101]
+// Test for message: type '%s' does not have member '%s' [101]
 struct point {
 	int x, y;
 };
 int
 get_z(const struct point *p)
+{
 	return p.z;		/* expect: 101 */
+}