 @@ -1,14 +1,14 @@
-/*	$NetBSD: init.c,v 1.175 2021/03/29 20:39:18 rillig Exp $	*/
+/*	$NetBSD: init.c,v 1.176 2021/03/29 20:52:00 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.175 2021/03/29 20:39:18 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.176 2021/03/29 20:52:00 rillig Exp $");
 #endif
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 /*
  * Initialization
+ *
  * Handles initializations of global or local objects, like in:
+ *
 @@ -206,65 +206,65 @@ struct brace_level {
 	 * of 2021-03-25).
 	 */
 	struct brace_level *bl_enclosing;
 };
 /*
  * A single component on the path to the sub-object that is initialized by an
  * initializer expression.  Either a struct or union member, or an array
  * subscript.
+ *
  * See also: C99 6.7.8 "Initialization"
  */
 struct designator {
-	const char *name;		/* for struct and union */
+	const char	*dr_name;		/* for struct and union */
-	/* TODO: add 'subscript' for arrays */
+	/* TODO: add 'dr_subscript' for arrays */
-	struct designator *next;
+	struct designator *dr_next;
 };
 /*
  * The optional designation for an initializer, saying which sub-object to
  * initialize.  Examples for designations are '.member' or
  * '.member[123].member.member[1][1]'.
+ *
  * See also: C99 6.7.8 "Initialization"
  */
 struct designation {
-	struct designator *head;
+	struct designator *dn_head;
-	struct designator *tail;
+	struct designator *dn_tail;
 };
 struct initialization {
 	/*
 	 * is set as soon as a fatal error occurred in the initialization.
 	 * The effect is that the rest of the initialization is ignored
 	 * (parsed by yacc, expression trees built, but no initialization
 	 * takes place).
 	 */
-	bool	initerr;
+	bool		in_err;
 	/* The symbol that is to be initialized. */
-	sym_t	*initsym;
+	sym_t		*in_sym;
 	/* The innermost brace level. */
-	struct brace_level *brace_level;
+	struct brace_level *in_brace_level;
 	/*
 	 * The C99 designator, if any, for the current initialization
 	 * expression.
 	 */
-	struct designation designation;
+	struct designation in_designation;
-	struct initialization *next;
+	struct initialization *in_next;
 };
 static struct initialization *init;
 #ifdef DEBUG
 static int debug_ind = 0;
 #endif
 #ifdef DEBUG
 @@ -415,90 +415,92 @@ check_init_expr(scl_t sclass, const type
 	/*
 	 * XXX: Is it correct to do this conversion _after_ the typeok above?
 	 */
 	if (lt != rt || (tp->t_bitfield && tn->tn_op == CON))
 		tn = convert(INIT, 0, unconst_cast(tp), tn);
 	check_non_constant_initializer(tn, sclass);
+}
 static struct designator *
 designator_new(const char *name)
+{
-	struct designator *d = xcalloc(1, sizeof *d);
+	struct designator *dr;
 	d->name = name;
-	return d;
+	dr = xcalloc(1, sizeof *dr);
 	dr->dr_name = name;
 	return dr;
+}
 static void
-designator_free(struct designator *d)
+designator_free(struct designator *dr)
+{
-	free(d);
+	free(dr);
+}
 #ifdef DEBUG
 static void
 designation_debug(const struct designation *dn)
+{
-	const struct designator *p;
+	const struct designator *dr;
-	if (dn->head == NULL)
+	if (dn->dn_head == NULL)
 		return;
 	debug_indent();
 	debug_printf("designation: ");
-	for (p = dn->head; p != NULL; p = p->next)
+	for (dr = dn->dn_head; dr != NULL; dr = dr->dr_next)
-		debug_printf(".%s", p->name);
+		debug_printf(".%s", dr->dr_name);
 	debug_printf("\n");
+}
 #else
 #define designation_debug(dn) do { } while (false)
 #endif
 static void
 designation_add(struct designation *dn, struct designator *dr)
+{
-	if (dn->head != NULL) {
+	if (dn->dn_head != NULL) {
-		dn->tail->next = dr;
+		dn->dn_tail->dr_next = dr;
-		dn->tail = dr;
+		dn->dn_tail = dr;
 	} else {
-		dn->head = dr;
+		dn->dn_head = dr;
-		dn->tail = dr;
+		dn->dn_tail = dr;
+	}
 	designation_debug(dn);
+}
 /* TODO: add support for array subscripts, not only named members */
 /*
  * TODO: This function should not be necessary at all.  There is no need to
  *  remove the head of the list.
  */
 static void
 designation_shift_level(struct designation *dn)
+{
-	lint_assert(dn->head != NULL);
+	lint_assert(dn->dn_head != NULL);
-	if (dn->head == dn->tail) {
+	if (dn->dn_head == dn->dn_tail) {
-		designator_free(dn->head);
+		designator_free(dn->dn_head);
-		dn->head = NULL;
+		dn->dn_head = NULL;
-		dn->tail = NULL;
+		dn->dn_tail = NULL;
 	} else {
-		struct designator *head = dn->head;
+		struct designator *head = dn->dn_head;
-		dn->head = dn->head->next;
+		dn->dn_head = dn->dn_head->dr_next;
 		designator_free(head);
+	}
 	designation_debug(dn);
+}
 static struct brace_level *
 brace_level_new(type_t *type, type_t *subtype, int remaining,
 		struct brace_level *enclosing)
+{
 	struct brace_level *level = xcalloc(1, sizeof(*level));
 @@ -755,404 +757,404 @@ brace_level_extend_if_array_of_unknown_s
 	level->bl_remaining = 1;
 	level->bl_type->t_dim++;
 	setcomplete(level->bl_type, true);
 	debug_step("extended type is '%s'", type_name(level->bl_type));
+}
 static struct initialization *
 initialization_new(sym_t *sym)
+{
 	struct initialization *in = xcalloc(1, sizeof(*in));
-	in->initsym = sym;
+	in->in_sym = sym;
 	return in;
+}
 static void
 initialization_free(struct initialization *in)
+{
-	struct brace_level *level, *next;
+	struct brace_level *bl, *next;
-	for (level = in->brace_level; level != NULL; level = next) {
+	for (bl = in->in_brace_level; bl != NULL; bl = next) {
-		next = level->bl_enclosing;
+		next = bl->bl_enclosing;
-		brace_level_free(level);
+		brace_level_free(bl);
+	}
 	free(in);
+}
 #ifdef DEBUG
 /*
  * TODO: only call debug_initstack after each push/pop.
  */
 static void
 initialization_debug(const struct initialization *in)
+{
-	if (in->brace_level == NULL) {
+	if (in->in_brace_level == NULL) {
 		debug_step("no brace level in the current initialization");
 		return;
+	}
 	size_t i = 0;
-	for (const struct brace_level *level = in->brace_level;
+	for (const struct brace_level *level = in->in_brace_level;
 	     level != NULL; level = level->bl_enclosing) {
 		debug_indent();
 		debug_printf("brace level %zu: ", i);
 		brace_level_debug(level);
 		i++;
+	}
+}
 #else
 #define initialization_debug(in) do { } while (false)
 #endif
 /*
  * Initialize the initialization stack by putting an entry for the object
  * which is to be initialized on it.
+ *
  * TODO: merge into initialization_new if possible
  */
 static void
 initialization_init(struct initialization *in)
+{
-	if (in->initerr)
+	if (in->in_err)
 		return;
 	debug_enter();
 	/*
 	 * If the type which is to be initialized is an incomplete array,
 	 * it must be duplicated.
 	 */
-	if (in->initsym->s_type->t_tspec == ARRAY && is_incomplete(in->initsym->s_type))
+	if (in->in_sym->s_type->t_tspec == ARRAY && is_incomplete(in->in_sym->s_type))
-		in->initsym->s_type = duptyp(in->initsym->s_type);
+		in->in_sym->s_type = duptyp(in->in_sym->s_type);
 	/* TODO: does 'duptyp' create a memory leak? */
-	in->brace_level = brace_level_new(NULL, in->initsym->s_type, 1, NULL);
+	in->in_brace_level = brace_level_new(NULL, in->in_sym->s_type, 1, NULL);
 	initialization_debug(in);
 	debug_leave();
+}
 static void
 initialization_set_error(struct initialization *in)
+{
-	in->initerr = true;
+	in->in_err = true;
+}
 /* TODO: document me */
 /* TODO: think of a better name than 'push' */
 static bool
 initialization_push_struct_or_union(struct initialization *in)
+{
-	struct brace_level *level = in->brace_level;
+	struct brace_level *level = in->in_brace_level;
 	int cnt;
 	sym_t *m;
 	if (is_incomplete(level->bl_type)) {
 		/* initialization of an incomplete type */
 		error(175);
 		initialization_set_error(in);
 		return false;
+	}
 	cnt = 0;
-	designation_debug(&in->designation);
+	designation_debug(&in->in_designation);
 	debug_step("lookup for '%s'%s",
 	    type_name(level->bl_type),
 	    level->bl_seen_named_member ? ", seen named member" : "");
-	if (in->designation.head != NULL)
+	if (in->in_designation.dn_head != NULL)
 		m = brace_level_look_up_first_member_named(level,
-		    in->designation.head->name, &cnt);
+		    in->in_designation.dn_head->dr_name, &cnt);
 	else
 		m = brace_level_look_up_first_member_unnamed(level, &cnt);
-	if (in->designation.head != NULL) {
+	if (in->in_designation.dn_head != NULL) {
 		if (m == NULL) {
 			debug_step("pop struct");
 			return true;
+		}
 		level->bl_next_member = m;
 		level->bl_subtype = m->s_type;
 		level->bl_seen_named_member = true;
 		debug_step("named member '%s'",
-		    in->designation.head->name);
+		    in->in_designation.dn_head->dr_name);
-		designation_shift_level(&in->designation);
+		designation_shift_level(&in->in_designation);
 		cnt = level->bl_type->t_tspec == STRUCT ? 2 : 1;
+	}
 	level->bl_brace = true;
 	debug_step("unnamed element with type '%s'%s",
 	    type_name(
 		level->bl_type != NULL ? level->bl_type : level->bl_subtype),
 	    level->bl_brace ? ", needs closing brace" : "");
 	if (cnt == 0) {
 		/* cannot init. struct/union with no named member */
 		error(179);
 		initialization_set_error(in);
 		return false;
+	}
 	level->bl_remaining = level->bl_type->t_tspec == STRUCT ? cnt : 1;
 	return false;
+}
 static void
 initialization_end_brace_level(struct initialization *in)
+{
-	struct brace_level *level = in->brace_level;
+	struct brace_level *level = in->in_brace_level;
-	in->brace_level = level->bl_enclosing;
+	in->in_brace_level = level->bl_enclosing;
 	brace_level_free(level);
+}
 /* TODO: document me */
 /* TODO: think of a better name than 'push' */
 static void
 initialization_push(struct initialization *in)
+{
 	struct brace_level *level;
 	debug_enter();
-	brace_level_extend_if_array_of_unknown_size(in->brace_level);
+	brace_level_extend_if_array_of_unknown_size(in->in_brace_level);
-	level = in->brace_level;
+	level = in->in_brace_level;
 	lint_assert(level->bl_remaining > 0);
-	in->brace_level = brace_level_new(brace_level_subtype(level), NULL, 0,
+	in->in_brace_level = brace_level_new(brace_level_subtype(level), NULL, 0,
 	    level);
-	lint_assert(in->brace_level->bl_type != NULL);
+	lint_assert(in->in_brace_level->bl_type != NULL);
-	lint_assert(in->brace_level->bl_type->t_tspec != FUNC);
+	lint_assert(in->in_brace_level->bl_type->t_tspec != FUNC);
 again:
-	level = in->brace_level;
+	level = in->in_brace_level;
 	debug_step("expecting type '%s'", type_name(level->bl_type));
 	lint_assert(level->bl_type != NULL);
 	switch (level->bl_type->t_tspec) {
 	case ARRAY:
-		if (in->designation.head != NULL) {
+		if (in->in_designation.dn_head != NULL) {
 			debug_step("pop array, named member '%s'%s",
-			    in->designation.head->name,
+			    in->in_designation.dn_head->dr_name,
 			    level->bl_brace ? ", needs closing brace" : "");
 			goto pop;
+		}
 		if (!brace_level_push_array(level))
 			initialization_set_error(in);
 		break;
 	case UNION:
 		if (tflag)
 			/* initialization of union is illegal in trad. C */
 			warning(238);
 		/* FALLTHROUGH */
 	case STRUCT:
 		if (initialization_push_struct_or_union(in))
 			goto pop;
 		break;
 	default:
-		if (in->designation.head != NULL) {
+		if (in->in_designation.dn_head != NULL) {
 			debug_step("pop scalar");
 		pop:
 			initialization_end_brace_level(in);
 			goto again;
+		}
 		/* The initialization stack now expects a single scalar. */
 		level->bl_remaining = 1;
 		break;
+	}
 	initialization_debug(in);
 	debug_leave();
+}
 /* TODO: document me */
 static void
 initialization_pop_item_named(struct initialization *in, const char *name)
+{
-	struct brace_level *level = in->brace_level;
+	struct brace_level *level = in->in_brace_level;
 	const sym_t *m;
 	/*
 	 * TODO: fix wording of the debug message; this doesn't seem to be
 	 * related to initializing the named member.
 	 */
 	debug_step("initializing named member '%s'", name);
 	if (!is_struct_or_union(level->bl_type->t_tspec)) {
 		/* syntax error '%s' */
 		error(249, "named member must only be used with struct/union");
 		initialization_set_error(in);
 		return;
+	}
 	m = brace_level_look_up_member(level, name);
 	if (m == NULL) {
 		/* TODO: add type information to the message */
 		/* undefined struct/union member: %s */
 		error(101, name);
-		designation_shift_level(&in->designation);
+		designation_shift_level(&in->in_designation);
 		level->bl_seen_named_member = true;
 		return;
+	}
 	debug_step("found matching member");
 	level->bl_subtype = m->s_type;
 	/* XXX: why ++? */
 	level->bl_remaining++;
 	/* XXX: why is bl_seen_named_member not set? */
-	designation_shift_level(&in->designation);
+	designation_shift_level(&in->in_designation);
+}
 /* TODO: think of a better name than 'pop' */
 static void
 initialization_pop_item(struct initialization *in)
+{
 	struct brace_level *level;
 	debug_enter();
-	level = in->brace_level;
+	level = in->in_brace_level;
 	debug_indent();
 	debug_printf("popping: ");
 	brace_level_debug(level);
-	in->brace_level = level->bl_enclosing;
+	in->in_brace_level = level->bl_enclosing;
 	brace_level_free(level);
-	level = in->brace_level;
+	level = in->in_brace_level;
 	lint_assert(level != NULL);
 	level->bl_remaining--;
 	lint_assert(level->bl_remaining >= 0);
 	debug_step("%d elements remaining", level->bl_remaining);
-	if (in->designation.head != NULL && in->designation.head->name != NULL)
+	if (in->in_designation.dn_head != NULL && in->in_designation.dn_head->dr_name != NULL)
-		initialization_pop_item_named(in, in->designation.head->name);
+		initialization_pop_item_named(in, in->in_designation.dn_head->dr_name);
 	else
 		brace_level_pop_item_unnamed(level);
 	initialization_debug(in);
 	debug_leave();
+}
 /*
  * Take all entries which cannot be used for further initializers from the
  * stack, but do this only if they do not require a closing brace.
  */
 /* TODO: think of a better name than 'pop' */
 static void
 initialization_pop_nobrace(struct initialization *in)
+{
 	debug_enter();
-	while (!in->brace_level->bl_brace &&
+	while (!in->in_brace_level->bl_brace &&
-	       in->brace_level->bl_remaining == 0 &&
+	       in->in_brace_level->bl_remaining == 0 &&
-	       !in->brace_level->bl_array_of_unknown_size)
+	       !in->in_brace_level->bl_array_of_unknown_size)
 		initialization_pop_item(in);
 	debug_leave();
+}
 /*
  * Process a '{' in an initializer by starting the initialization of the
  * nested data structure, with bl_type being the bl_subtype of the outer
  * initialization level.
  */
 static void
 initialization_next_brace(struct initialization *in)
+{
 	debug_enter();
 	initialization_debug(in);
-	if (!in->initerr &&
+	if (!in->in_err &&
-	    !brace_level_check_too_many_initializers(in->brace_level))
+	    !brace_level_check_too_many_initializers(in->in_brace_level))
 		initialization_set_error(in);
-	if (!in->initerr)
+	if (!in->in_err)
 		initialization_push(in);
-	if (!in->initerr) {
+	if (!in->in_err) {
-		in->brace_level->bl_brace = true;
+		in->in_brace_level->bl_brace = true;
-		designation_debug(&in->designation);
+		designation_debug(&in->in_designation);
-		if (in->brace_level->bl_type != NULL)
+		if (in->in_brace_level->bl_type != NULL)
 			debug_step("expecting type '%s'",
-			    type_name(in->brace_level->bl_type));
+			    type_name(in->in_brace_level->bl_type));
+	}
 	initialization_debug(in);
 	debug_leave();
+}
 static void
 check_no_auto_aggregate(scl_t sclass, const struct brace_level *level)
+{
 	if (!tflag)
 		return;
 	if (!(sclass == AUTO || sclass == REG))
 		return;
 	if (!(level->bl_enclosing == NULL))
 		return;
 	if (is_scalar(level->bl_subtype->t_tspec))
 		return;
 	/* no automatic aggregate initialization in trad. C */
 	warning(188);
+}
 static void
 initialization_lbrace(struct initialization *in)
+{
-	if (in->initerr)
+	if (in->in_err)
 		return;
 	debug_enter();
 	initialization_debug(in);
-	check_no_auto_aggregate(in->initsym->s_scl, in->brace_level);
+	check_no_auto_aggregate(in->in_sym->s_scl, in->in_brace_level);
 	/*
 	 * Remove all entries which cannot be used for further initializers
 	 * and do not expect a closing brace.
 	 */
 	initialization_pop_nobrace(in);
 	initialization_next_brace(in);
 	initialization_debug(in);
 	debug_leave();
+}
 /*
  * Process a '}' in an initializer by finishing the current level of the
  * initialization stack.
+ *
  * Take all entries, including the first which requires a closing brace,
  * from the stack.
  */
 static void
 initialization_rbrace(struct initialization *in)
+{
 	bool brace;
-	if (in->initerr)
+	if (in->in_err)
 		return;
 	debug_enter();
 	do {
-		brace = in->brace_level->bl_brace;
+		brace = in->in_brace_level->bl_brace;
 		/* TODO: improve wording of the debug message */
 		debug_step("loop brace=%d", brace);
 		initialization_pop_item(in);
 	} while (!brace);
 	initialization_debug(in);
 	debug_leave();
+}
 /*
  * 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.
+ *
 @@ -1174,27 +1176,27 @@ initialization_add_designator_subscript(
+{
 	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. */
 	initialization_pop_nobrace(in);
-	level = in->brace_level;
+	level = in->in_brace_level;
 	if (level->bl_array_of_unknown_size) {
 		/* No +1 here, extend_if_array_of_unknown_size will add it. */
 		int auto_dim = (int)range.hi;
 		if (auto_dim > level->bl_type->t_dim)
 			brace_level_set_array_dimension(level, auto_dim);
+	}
 	debug_leave();
+}
 static bool
 is_string_array(const type_t *tp, tspec_t t)
+{
 @@ -1210,39 +1212,39 @@ is_string_array(const type_t *tp, tspec_
 /* Initialize a character array or wchar_t array with a string literal. */
 static bool
 initialization_init_array_using_string(struct initialization *in, tnode_t *tn)
+{
 	struct brace_level *level;
 	strg_t	*strg;
 	if (tn->tn_op != STRING)
 		return false;
 	debug_enter();
-	level = in->brace_level;
+	level = in->in_brace_level;
 	strg = tn->tn_string;
 	/*
 	 * Check if we have an array type which can be initialized by
 	 * the string.
 	 */
 	if (is_string_array(level->bl_subtype, strg->st_tspec)) {
 		debug_step("subtype is an array");
 		/* Put the array at top of stack */
 		initialization_push(in);
-		level = in->brace_level;
+		level = in->in_brace_level;
 	} else if (is_string_array(level->bl_type, strg->st_tspec)) {
 		debug_step("type is an array");
 		/*
 		 * If the array is already partly initialized, we are
 		 * wrong here.
 		 */
 		if (level->bl_remaining != level->bl_type->t_dim)
 			goto nope;
 	} else
 		goto nope;
 @@ -1278,63 +1280,63 @@ nope:
 	debug_leave();
 	return false;
+}
 /*
  * Initialize a non-array object with automatic storage duration and only a
  * single initializer expression without braces by delegating to ASSIGN.
  */
 static bool
 initialization_init_using_assign(struct initialization *in, tnode_t *rn)
+{
 	tnode_t *ln, *tn;
-	if (in->initsym->s_type->t_tspec == ARRAY)
+	if (in->in_sym->s_type->t_tspec == ARRAY)
 		return false;
-	if (in->brace_level->bl_enclosing != NULL)
+	if (in->in_brace_level->bl_enclosing != NULL)
 		return false;
 	debug_step("handing over to ASSIGN");
-	ln = new_name_node(in->initsym, 0);
+	ln = new_name_node(in->in_sym, 0);
 	ln->tn_type = tduptyp(ln->tn_type);
 	ln->tn_type->t_const = false;
 	tn = build(ASSIGN, ln, rn);
 	expr(tn, false, false, false, false);
 	/* XXX: why not clean up the initstack here already? */
 	return true;
+}
 /* TODO: document me, or think of a better name */
 static void
 initialization_next_nobrace(struct initialization *in, tnode_t *tn)
+{
 	debug_enter();
-	if (in->brace_level->bl_type == NULL &&
+	if (in->in_brace_level->bl_type == NULL &&
-	    !is_scalar(in->brace_level->bl_subtype->t_tspec)) {
+	    !is_scalar(in->in_brace_level->bl_subtype->t_tspec)) {
 		/* {}-enclosed initializer required */
 		error(181);
 		/* XXX: maybe set initerr here */
+	}
-	if (!in->initerr &&
+	if (!in->in_err &&
-	    !brace_level_check_too_many_initializers(in->brace_level))
+	    !brace_level_check_too_many_initializers(in->in_brace_level))
 		initialization_set_error(in);
-	while (!in->initerr) {
+	while (!in->in_err) {
-		struct brace_level *level = in->brace_level;
+		struct brace_level *level = in->in_brace_level;
 		if (tn->tn_type->t_tspec == STRUCT &&
 		    level->bl_type == tn->tn_type &&
 		    level->bl_enclosing != NULL &&
 		    level->bl_enclosing->bl_enclosing != NULL) {
 			level->bl_brace = false;
 			level->bl_remaining = 1; /* the struct itself */
 			break;
+		}
 		if (level->bl_type != NULL &&
 		    is_scalar(level->bl_type->t_tspec))
 			break;
 @@ -1342,114 +1344,114 @@ initialization_next_nobrace(struct initi
+	}
 	initialization_debug(in);
 	debug_leave();
+}
 static void
 initialization_expr(struct initialization *in, tnode_t *tn)
+{
 	scl_t	sclass;
 	debug_enter();
 	initialization_debug(in);
-	designation_debug(&in->designation);
+	designation_debug(&in->in_designation);
 	debug_step("expr:");
 	debug_node(tn, debug_ind + 1);
-	if (in->initerr || tn == NULL)
+	if (in->in_err || tn == NULL)
 		goto done;
-	sclass = in->initsym->s_scl;
+	sclass = in->in_sym->s_scl;
 	if ((sclass == AUTO || sclass == REG) &&
 	    initialization_init_using_assign(in, tn))
 		goto done;
 	initialization_pop_nobrace(in);
 	if (initialization_init_array_using_string(in, tn)) {
 		debug_step("after initializing the string:");
 		goto done_debug;
+	}
 	initialization_next_nobrace(in, tn);
-	if (in->initerr || tn == NULL)
+	if (in->in_err || tn == NULL)
 		goto done_debug;
 	/* Using initsym here is better than nothing. */
-	check_init_expr(sclass, in->brace_level->bl_type, in->initsym, tn);
+	check_init_expr(sclass, in->in_brace_level->bl_type, in->in_sym, tn);
-	in->brace_level->bl_remaining--;
+	in->in_brace_level->bl_remaining--;
-	debug_step("%d elements remaining", in->brace_level->bl_remaining);
+	debug_step("%d elements remaining", in->in_brace_level->bl_remaining);
 done_debug:
 	initialization_debug(in);
 done:
-	while (in->designation.head != NULL)
+	while (in->in_designation.dn_head != NULL)
-		designation_shift_level(&in->designation);
+		designation_shift_level(&in->in_designation);
 	debug_leave();
+}
 static struct initialization *
 current_init(void)
+{
 	lint_assert(init != NULL);
 	return init;
+}
 bool *
 current_initerr(void)
+{
-	return &current_init()->initerr;
+	return &current_init()->in_err;
+}
 sym_t **
 current_initsym(void)
+{
-	return &current_init()->initsym;
+	return &current_init()->in_sym;
+}
 void
 begin_initialization(sym_t *sym)
+{
 	struct initialization *in;
 	debug_step("begin initialization of '%s'", type_name(sym->s_type));
 	in = initialization_new(sym);
-	in->next = init;
+	in->in_next = init;
 	init = in;
+}
 void
 end_initialization(void)
+{
 	struct initialization *in;
 	in = init;
-	init = init->next;
+	init = init->in_next;
 	initialization_free(in);
 	debug_step("end initialization");
+}
 void
 add_designator_member(sbuf_t *sb)
+{
-	designation_add(&current_init()->designation,
+	designation_add(&current_init()->in_designation,
 	    designator_new(sb->sb_name));
+}
 void
 add_designator_subscript(range_t range)
+{
 	initialization_add_designator_subscript(current_init(), range);
+}
 void
 initstack_init(void)
+{