 @@ -1,15 +1,15 @@
 %{
-/* $NetBSD: cgram.y,v 1.204 2021/03/26 20:31:07 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.205 2021/03/28 10:09:34 rillig Exp $ */
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All Rights Reserved.
  * 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
 @@ -25,27 +25,27 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * 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.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.204 2021/03/26 20:31:07 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.205 2021/03/28 10:09:34 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 extern char *yytext;
 /*
  * Contains the level of current declaration, used for symbol table entries.
  * 0 is the top-level, > 0 is inside a function body.
 @@ -1369,50 +1369,50 @@ range:
 		$$.lo = to_int_constant($1, true);
 		$$.hi = $$.lo;
+	  }
 	| constant_expr T_ELLIPSIS constant_expr {
 		$$.lo = to_int_constant($1, true);
 		$$.hi = to_int_constant($3, true);
 		/* initialization with '[a...b]' is a GNU extension */
 		gnuism(340);
+	  }
+	;
 designator:			/* C99 6.7.8 "Initialization" */
 	  T_LBRACK range T_RBRACK {
-		designation_add_subscript($2);
+		add_designator_subscript($2);
 		if (!Sflag)
 			/* array initializer with des.s is a C9X feature */
 			warning(321);
+	  }
 	| point identifier {
 		if (!Sflag)
 			/* struct or union member name in initializer is ... */
 			warning(313);
-		designation_add_name($2);
+		add_designator_member($2);
+	  }
+	;
 designator_list:		/* C99 6.7.8 "Initialization" */
 	  designator
 	| designator_list designator
+	;
 designation:			/* C99 6.7.8 "Initialization" */
 	  designator_list T_ASSIGN
 	| identifier T_COLON {
 		/* GCC style struct or union member name in initializer */
 		gnuism(315);
-		designation_add_name($1);
+		add_designator_member($1);
+	  }
+	;
 init_lbrace:
 	  T_LBRACE {
 		init_lbrace();
+	  }
+	;
 init_rbrace:
 	  T_RBRACE {
 		init_rbrace();
+	  }

 @@ -1,14 +1,14 @@
-/*	$NetBSD: externs1.h,v 1.92 2021/03/27 22:04:39 rillig Exp $	*/
+/*	$NetBSD: externs1.h,v 1.93 2021/03/28 10:09:34 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.
 @@ -289,28 +289,28 @@ extern	void	bitfieldtype(int);
 /*
  * init.c
  */
 extern	void	begin_initialization(sym_t *);
 extern	void	end_initialization(void);
 extern	bool	*current_initerr(void);
 extern	sym_t	**current_initsym(void);
 extern	void	initstack_init(void);
 extern	void	init_rbrace(void);
 extern	void	init_lbrace(void);
 extern	void	init_using_expr(tnode_t *);
-extern	void	designation_add_name(sbuf_t *);
+extern	void	add_designator_member(sbuf_t *);
-extern	void	designation_add_subscript(range_t);
+extern	void	add_designator_subscript(range_t);
 /*
  * emit.c
  */
 extern	void	outtype(const type_t *);
 extern	const	char *ttos(const type_t *);
 extern	void	outsym(const sym_t *, scl_t, def_t);
 extern	void	outfdef(const sym_t *, const pos_t *, bool, bool,
 		    const sym_t *);
 extern	void	outcall(const tnode_t *, bool, bool);
 extern	void	outusg(const sym_t *);
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.156 2021/03/28 10:05:19 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.157 2021/03/28 10:09:34 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: init.c,v 1.156 2021/03/28 10:05:19 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.157 2021/03/28 10:09:34 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -62,28 +62,28 @@ __RCSID("$NetBSD: init.c,v 1.156 2021/03
  *	struct { int x, y; } point = { .y = 4, .x = 3 };
+ *
  * Any scalar expression in the initializer may be surrounded by arbitrarily
  * many extra pairs of braces, like in the example 'number_with_braces' (C99
  * 6.7.8p11).
+ *
  * For multi-dimensional arrays, the inner braces may be omitted like in
  * array_flat or spelled out like in array_nested.
+ *
  * For the initializer, the grammar parser calls these functions:
+ *
  *	begin_initialization
  *		init_lbrace			for each '{'
- *		designation_add_name		for each '.member' before '='
+ *		add_designator_member		for each '.member' before '='
- *		designation_add_subscript	for each '[123]' before '='
+ *		add_designator_subscript	for each '[123]' before '='
  *		init_using_expr			for each expression
  *		init_rbrace			for each '}'
  *	end_initialization
+ *
  * Each '{' begins a new brace level, each '}' ends the current brace level.
  * Each brace level has an associated "current object".
+ *
  * Most of the time, the topmost level of brace_level contains a scalar type,
  * and its remaining count toggles between 1 and 0.
+ *
  * See also:
  *	C99 6.7.8 "Initialization"
  *	d_c99_init.c for more examples
 @@ -645,57 +645,55 @@ begin_initialization(sym_t *sym)
+}
 void
 end_initialization(void)
+{
 	struct initialization *in;
 	in = init;
 	init = init->next;
 	initialization_free(in);
 	debug_step("end initialization");
+}
 void
-designation_add_name(sbuf_t *sb)
+add_designator_member(sbuf_t *sb)
+{
 	designation_add(&current_init()->designation,
 	    designator_new(sb->sb_name));
+}
 /* TODO: Move the function body up here, to avoid the forward declaration. */
 static void initstack_pop_nobrace(struct initialization *);
 /*
  * A sub-object of an array is initialized using a designator.  This does not
  * have to be an array element directly, it can also be used to initialize
  * only a sub-object of the array element.
+ *
  * C99 example: struct { int member[4]; } var = { [2] = 12345 };
+ *
  * GNU example: struct { int member[4]; } var = { [1 ... 3] = 12345 };
+ *
  * TODO: test the following initialization with an outer and an inner type:
+ *
  * .deeply[0].nested = {
  *	.deeply[1].nested = {
  *		12345,
  *	},
  * }
  */
 void
-designation_add_subscript(range_t range)
+add_designator_subscript(range_t range)
+{
 	struct initialization *in = current_init();
 	struct brace_level *level;
 	debug_enter();
 	if (range.lo == range.hi)
 		debug_step("subscript is %zu", range.hi);
 	else
 		debug_step("subscript range is %zu ... %zu",
 		    range.lo, range.hi);
 	/* XXX: This call is wrong here, it must be somewhere else. */
 	initstack_pop_nobrace(in);