 @@ -1,1285 +1,1286 @@
-/* $NetBSD: decl.c,v 1.366 2023/07/29 07:49:14 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.367 2023/07/29 11:03:18 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
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by Jochen Pohl for
  *	The NetBSD Project.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * 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.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: decl.c,v 1.366 2023/07/29 07:49:14 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.367 2023/07/29 11:03:18 rillig Exp $");
 #endif
 #include <sys/param.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 const char unnamed[] = "<unnamed>";
 /* shared type structures for arithmetic types and void */
 static	type_t	typetab[NTSPEC];
 /* value of next enumerator during declaration of enum types */
 int	enumval;
 /*
  * Points to the innermost element of a stack that contains information about
  * nested declarations, such as struct declarations, function prototypes,
  * local variables.
  */
 decl_level	*dcs;
 /*
  * initializes all global vars used in declarations
  */
 void
 initdecl(void)
+{
 	/* declaration stack */
 	dcs = xcalloc(1, sizeof(*dcs));
 	dcs->d_kind = DLK_EXTERN;
 	dcs->d_last_dlsym = &dcs->d_first_dlsym;
 	if (!pflag) {
 		for (size_t i = 0; i < NTSPEC; i++) {
 			if (ttab[i].tt_rank_kind != RK_NONE)
 				ttab[i].tt_rank_value =
 				    ttab[i].tt_size_in_bits;
+		}
 		ttab[BOOL].tt_rank_value = 1;
+	}
 	if (Tflag) {
 		ttab[BOOL].tt_is_integer = false;
 		ttab[BOOL].tt_is_uinteger = false;
 		ttab[BOOL].tt_is_arithmetic = false;
+	}
 	/* struct, union, enum, ptr, array and func are not shared. */
 	for (int i = (int)SIGNED; i < (int)STRUCT; i++)
 		typetab[i].t_tspec = (tspec_t)i;
+}
 /*
  * Returns a shared type structure for arithmetic types and void.
+ *
  * It's important to duplicate this structure using block_dup_type or
  * expr_dup_type if it is to be modified (adding qualifiers or anything
  * else).
  */
 type_t *
 gettyp(tspec_t t)
+{
 	lint_assert((int)t < (int)STRUCT);
 	/* TODO: make the return type 'const' */
 	return &typetab[t];
+}
 type_t *
 block_dup_type(const type_t *tp)
+{
 	type_t *ntp = block_zero_alloc(sizeof(*ntp), "type");
 	*ntp = *tp;
 	return ntp;
+}
 /* Duplicate a type, free the allocated memory after the expression. */
 type_t *
 expr_dup_type(const type_t *tp)
+{
 	type_t *ntp = expr_zero_alloc(sizeof(*ntp), "type");
 	*ntp = *tp;
 	return ntp;
+}
 /*
  * Return the unqualified version of the type.  The returned type is freed at
  * the end of the current expression.
+ *
  * See C99 6.2.5p25.
  */
 type_t *
 expr_unqualified_type(const type_t *tp)
+{
 	type_t *ntp = expr_zero_alloc(sizeof(*ntp), "type");
 	*ntp = *tp;
 	ntp->t_const = false;
 	ntp->t_volatile = false;
 	/*
 	 * In case of a struct or union type, the members should lose their
 	 * qualifiers as well, but that would require a deep copy of the
 	 * struct or union type.  This in turn would defeat the type
 	 * comparison in types_compatible, which simply tests whether
 	 * tp1->t_sou == tp2->t_sou.
 	 */
 	return ntp;
+}
 /*
  * Returns whether the argument is void or an incomplete array, struct, union
  * or enum type.
  */
 bool
 is_incomplete(const type_t *tp)
+{
 	tspec_t t = tp->t_tspec;
 	if (t == VOID)
 		return true;
 	if (t == ARRAY)
 		return tp->t_incomplete_array;
 	if (is_struct_or_union(t))
 		return tp->t_sou->sou_incomplete;
 	if (t == ENUM)
 		return tp->t_enum->en_incomplete;
 	return false;
+}
 void
 dcs_add_function_specifier(function_specifier fs)
+{
 	debug_step("%s: %s", __func__, function_specifier_name(fs));
 	if (fs == FS_INLINE) {
 		if (dcs->d_inline)
 			/* duplicate '%s' */
 			warning(10, "inline");
 		dcs->d_inline = true;
+	}
+}
 /*
  * Remember the storage class of the current declaration and detect multiple
  * storage classes.
  */
 void
 dcs_add_storage_class(scl_t sc)
+{
 	if (dcs->d_type != NULL || dcs->d_abstract_type != NO_TSPEC ||
 	    dcs->d_sign_mod != NO_TSPEC || dcs->d_rank_mod != NO_TSPEC) {
 		/* storage class after type is obsolescent */
 		warning(83);
+	}
 	if (dcs->d_scl == NOSCL)
 		dcs->d_scl = sc;
 	else if ((dcs->d_scl == EXTERN && sc == THREAD_LOCAL)
 	    || (dcs->d_scl == THREAD_LOCAL && sc == EXTERN))
 		dcs->d_scl = EXTERN;	/* ignore thread_local */
 	else if ((dcs->d_scl == STATIC && sc == THREAD_LOCAL)
 	    || (dcs->d_scl == THREAD_LOCAL && sc == STATIC))
 		dcs->d_scl = STATIC;	/* ignore thread_local */
 	else
 		dcs->d_multiple_storage_classes = true;
+}
 /* Merge the signedness into the abstract type. */
 static tspec_t
 merge_signedness(tspec_t t, tspec_t s)
+{
 	if (s == SIGNED)
 		return t == CHAR ? SCHAR : t;
 	if (s != UNSIGN)
 		return t;
 	return t == CHAR ? UCHAR
 	    : t == SHORT ? USHORT
 	    : t == INT ? UINT
 	    : t == LONG ? ULONG
 	    : t == LLONG ? ULLONG
 	    : t;
+}
 /*
  * Called if a list of declaration specifiers contains a typedef name
  * and other specifiers (except struct, union, enum, typedef name).
  */
 static type_t *
 typedef_error(type_t *td, tspec_t t)
+{
 	tspec_t t2 = td->t_tspec;
 	if ((t == SIGNED || t == UNSIGN) &&
 	    (t2 == CHAR || t2 == SHORT || t2 == INT ||
 	     t2 == LONG || t2 == LLONG)) {
 		if (allow_c90)
 			/* modifying typedef with '%s'; only qualifiers... */
 			warning(5, tspec_name(t));
 		td = block_dup_type(gettyp(merge_signedness(t2, t)));
 		td->t_typedef = true;
 		return td;
+	}
 	if (t == SHORT && (t2 == INT || t2 == UINT)) {
 		/* modifying typedef with '%s'; only qualifiers allowed */
 		warning(5, "short");
 		td = block_dup_type(gettyp(t2 == INT ? SHORT : USHORT));
 		td->t_typedef = true;
 		return td;
+	}
 	if (t != LONG)
 		goto invalid;
 	tspec_t lt;
 	if (t2 == INT)
-		td = gettyp(LONG);
+		lt = LONG;
 	else if (t2 == UINT)
-		td = gettyp(ULONG);
+		lt = ULONG;
 	else if (t2 == LONG)
-		td = gettyp(LLONG);
+		lt = LLONG;
 	else if (t2 == ULONG)
-		td = gettyp(ULLONG);
+		lt = ULLONG;
 	else if (t2 == FLOAT)
-		td = gettyp(DOUBLE);
+		lt = DOUBLE;
 	else if (t2 == DOUBLE)
-		td = gettyp(LDOUBLE);
+		lt = LDOUBLE;
 	else if (t2 == DCOMPLEX)
-		td = gettyp(LCOMPLEX);
+		lt = LCOMPLEX;
 	else
 		goto invalid;
 	/* modifying typedef with '%s'; only qualifiers allowed */
 	warning(5, "long");
-	td = block_dup_type(td);
+	td = block_dup_type(gettyp(lt));
 	td->t_typedef = true;
 	return td;
 invalid:
 	/* Anything else is not accepted. */
 	dcs->d_invalid_type_combination = true;
 	return td;
+}
 /*
  * Remember the type, modifier or typedef name returned by the parser in the
  * top element of the declaration stack. This information is used in
  * dcs_end_type to build the type used for all declarators in this declaration.
+ *
  * If tp->t_typedef is true, the type comes from a previously defined typename.
  * Otherwise, it comes from a type specifier (int, long, ...) or a
  * struct/union/enum tag.
  */
 void
 dcs_add_type(type_t *tp)
+{
 	debug_step("%s: %s", __func__, type_name(tp));
 	if (tp->t_typedef) {
 		/*
 		 * something like "typedef int a; int a b;"
 		 * This should not happen with current grammar.
 		 */
 		lint_assert(dcs->d_type == NULL);
 		lint_assert(dcs->d_abstract_type == NO_TSPEC);
 		lint_assert(dcs->d_sign_mod == NO_TSPEC);
 		lint_assert(dcs->d_rank_mod == NO_TSPEC);
 		dcs->d_type = tp;
 		return;
+	}
 	tspec_t t = tp->t_tspec;
 	if (is_struct_or_union(t) || t == ENUM) {
 		/*
 		 * something like "int struct a ..."
 		 * struct/union/enum with anything else is not allowed
 		 */
 		if (dcs->d_type != NULL || dcs->d_abstract_type != NO_TSPEC ||
 		    dcs->d_rank_mod != NO_TSPEC || dcs->d_sign_mod != NO_TSPEC) {
 			dcs->d_invalid_type_combination = true;
 			dcs->d_abstract_type = NO_TSPEC;
 			dcs->d_sign_mod = NO_TSPEC;
 			dcs->d_rank_mod = NO_TSPEC;
+		}
 		dcs->d_type = tp;
 		return;
+	}
 	if (dcs->d_type != NULL && !dcs->d_type->t_typedef) {
 		/*
 		 * something like "struct a int"
 		 * struct/union/enum with anything else is not allowed
 		 */
 		dcs->d_invalid_type_combination = true;
 		return;
+	}
 	if (t == COMPLEX) {
 		if (dcs->d_complex_mod == FLOAT)
 			t = FCOMPLEX;
 		else if (dcs->d_complex_mod == DOUBLE)
 			t = DCOMPLEX;
 		else {
 			/* invalid type for _Complex */
 			error(308);
 			t = DCOMPLEX; /* just as a fallback */
+		}
 		dcs->d_complex_mod = NO_TSPEC;
+	}
 	if (t == LONG && dcs->d_rank_mod == LONG) {
 		/* "long long" or "long ... long" */
 		t = LLONG;
 		dcs->d_rank_mod = NO_TSPEC;
 		if (!suppress_longlong)
 			/* %s does not support 'long long' */
 			c99ism(265, allow_c90 ? "C90" : "traditional C");
+	}
 	if (dcs->d_type != NULL && dcs->d_type->t_typedef) {
 		/* something like "typedef int a; a long ..." */
 		dcs->d_type = typedef_error(dcs->d_type, t);
 		return;
+	}
 	/* now it can be only a combination of arithmetic types and void */
 	if (t == SIGNED || t == UNSIGN) {
 		if (dcs->d_sign_mod != NO_TSPEC)
 			dcs->d_invalid_type_combination = true;
 		dcs->d_sign_mod = t;
 	} else if (t == SHORT || t == LONG || t == LLONG) {
 		if (dcs->d_rank_mod != NO_TSPEC)
 			dcs->d_invalid_type_combination = true;
 		dcs->d_rank_mod = t;
 	} else if (t == FLOAT || t == DOUBLE) {
 		if (dcs->d_rank_mod == NO_TSPEC || dcs->d_rank_mod == LONG) {
 			if (dcs->d_complex_mod != NO_TSPEC
 			    || (t == FLOAT && dcs->d_rank_mod == LONG))
 				dcs->d_invalid_type_combination = true;
 			dcs->d_complex_mod = t;
 		} else {
 			if (dcs->d_abstract_type != NO_TSPEC)
 				dcs->d_invalid_type_combination = true;
 			dcs->d_abstract_type = t;
+		}
 	} else if (t == PTR) {
 		dcs->d_type = tp;
 	} else {
 		if (dcs->d_abstract_type != NO_TSPEC)
 			dcs->d_invalid_type_combination = true;
 		dcs->d_abstract_type = t;
+	}
+}
 static void
 set_first_typedef(type_t *tp, sym_t *sym)
+{
 	tspec_t t = tp->t_tspec;
 	if (is_struct_or_union(t) && tp->t_sou->sou_first_typedef == NULL)
 		tp->t_sou->sou_first_typedef = sym;
 	if (t == ENUM && tp->t_enum->en_first_typedef == NULL)
 		tp->t_enum->en_first_typedef = sym;
+}
 static unsigned int
 bit_fields_width(const sym_t **mem, bool *named)
+{
 	unsigned int width = 0;
 	unsigned int align = 0;
 	while (*mem != NULL && (*mem)->s_type->t_bitfield) {
 		if ((*mem)->s_name != unnamed)
 			*named = true;
 		width += (*mem)->s_type->t_bit_field_width;
 		unsigned int mem_align = alignment_in_bits((*mem)->s_type);
 		if (mem_align > align)
 			align = mem_align;
 		*mem = (*mem)->s_next;
+	}
 	return (width + align - 1) & -align;
+}
 static void
 pack_struct_or_union(type_t *tp)
+{
 	if (!is_struct_or_union(tp->t_tspec)) {
 		/* attribute '%s' ignored for '%s' */
 		warning(326, "packed", type_name(tp));
 		return;
+	}
 	unsigned int bits = 0;
 	bool named = false;
 	for (const sym_t *mem = tp->t_sou->sou_first_member;
 	     mem != NULL; mem = mem->s_next) {
 		// TODO: Maybe update mem->u.s_member.sm_offset_in_bits.
 		if (mem->s_type->t_bitfield) {
 			bits += bit_fields_width(&mem, &named);
 			if (mem == NULL)
 				break;
+		}
 		unsigned int mem_bits = type_size_in_bits(mem->s_type);
 		if (tp->t_tspec == STRUCT)
 			bits += mem_bits;
 		else if (mem_bits > bits)
 			bits = mem_bits;
+	}
 	tp->t_sou->sou_size_in_bits = bits;
+}
 void
 dcs_add_packed(void)
+{
 	if (dcs->d_type == NULL)
 		dcs->d_packed = true;
 	else
 		pack_struct_or_union(dcs->d_type);
+}
 void
 dcs_set_used(void)
+{
 	dcs->d_used = true;
+}
 /*
  * Remember a qualifier that is part of the declaration specifiers (and not the
  * declarator). The remembered qualifier is used by dcs_end_type for all
  * declarators.
  */
 void
 dcs_add_qualifiers(type_qualifiers qs)
+{
 	add_type_qualifiers(&dcs->d_qual, qs);
+}
 void
 begin_declaration_level(decl_level_kind kind)
+{
 	decl_level *dl = xcalloc(1, sizeof(*dl));
 	dl->d_enclosing = dcs;
 	dl->d_kind = kind;
 	dl->d_last_dlsym = &dl->d_first_dlsym;
 	dcs = dl;
 	debug_enter();
 	debug_dcs(true);
+}
 void
 end_declaration_level(void)
+{
 	debug_dcs(true);
 	decl_level *dl = dcs;
 	dcs = dl->d_enclosing;
 	lint_assert(dcs != NULL);
 	switch (dl->d_kind) {
 	case DLK_STRUCT:
 	case DLK_UNION:
 	case DLK_ENUM:
 		/*
 		 * Symbols declared in (nested) structs or enums are part of
 		 * the next level (they are removed from the symbol table if
 		 * the symbols of the outer level are removed).
 		 */
 		if ((*dcs->d_last_dlsym = dl->d_first_dlsym) != NULL)
 			dcs->d_last_dlsym = dl->d_last_dlsym;
 		break;
 	case DLK_OLD_STYLE_ARGS:
 		/*
 		 * All symbols in dcs->d_first_dlsym are introduced in
 		 * old-style argument declarations (it's not clean, but
 		 * possible). They are appended to the list of symbols declared
 		 * in an old-style argument identifier list or a new-style
 		 * parameter type list.
 		 */
 		if (dl->d_first_dlsym != NULL) {
 			*dl->d_last_dlsym = dcs->d_func_proto_syms;
 			dcs->d_func_proto_syms = dl->d_first_dlsym;
+		}
 		break;
 	case DLK_ABSTRACT:
 		/*
 		 * Append all symbols declared in the abstract declaration to
 		 * the list of symbols declared in the surrounding declaration
 		 * or block.
+		 *
 		 * XXX I'm not sure whether they should be removed from the
 		 * symbol table now or later.
 		 */
 		if ((*dcs->d_last_dlsym = dl->d_first_dlsym) != NULL)
 			dcs->d_last_dlsym = dl->d_last_dlsym;
 		break;
 	case DLK_AUTO:
 		check_usage(dl);
 		/* FALLTHROUGH */
 	case DLK_PROTO_PARAMS:
 		/* usage of arguments will be checked by end_function() */
 		symtab_remove_level(dl->d_first_dlsym);
 		break;
 	case DLK_EXTERN:
 		/* there is nothing around an external declaration */
 		/* FALLTHROUGH */
 	default:
 		lint_assert(/*CONSTCOND*/false);
+	}
 	free(dl);
 	debug_leave();
+}
 /*
  * Set flag d_asm in all declaration stack elements up to the outermost one.
+ *
  * This is used to mark compound statements which have, possibly in nested
  * compound statements, asm statements. For these compound statements, no
  * warnings about unused or uninitialized variables are printed.
+ *
  * There is no need to clear d_asm in decl_level structs with context AUTO, as
  * these structs are freed at the end of the compound statement. But it must be
  * cleared in the outermost decl_level struct, which has context EXTERN. This
  * could be done in dcs_begin_type and would work for C90, but not for C99 or
  * C++ (due to mixed statements and declarations). Thus, we clear it in
  * global_clean_up_decl.
  */
 void
 dcs_set_asm(void)
+{
 	for (decl_level *dl = dcs; dl != NULL; dl = dl->d_enclosing)
 		dl->d_asm = true;
+}
 void
 dcs_begin_type(void)
+{
 	debug_enter();
 	dcs->d_abstract_type = NO_TSPEC;
 	dcs->d_complex_mod = NO_TSPEC;
 	dcs->d_sign_mod = NO_TSPEC;
 	dcs->d_rank_mod = NO_TSPEC;
 	dcs->d_scl = NOSCL;
 	dcs->d_type = NULL;
 	dcs->d_qual = (type_qualifiers) { .tq_const = false };
 	dcs->d_inline = false;
 	dcs->d_multiple_storage_classes = false;
 	dcs->d_invalid_type_combination = false;
 	dcs->d_nonempty_decl = false;
 	dcs->d_no_type_specifier = false;
+}
 static void
 dcs_adjust_storage_class(void)
+{
 	if (dcs->d_kind == DLK_EXTERN) {
 		if (dcs->d_scl == REG || dcs->d_scl == AUTO) {
 			/* illegal storage class */
 			error(8);
 			dcs->d_scl = NOSCL;
+		}
 	} else if (dcs->d_kind == DLK_OLD_STYLE_ARGS ||
 		   dcs->d_kind == DLK_PROTO_PARAMS) {
 		if (dcs->d_scl != NOSCL && dcs->d_scl != REG) {
 			/* only 'register' is valid as storage class ... */
 			error(9);
 			dcs->d_scl = NOSCL;
+		}
+	}
+}
 /*
  * Merge the declaration specifiers from dcs into dcs->d_type.
+ *
  * See C99 6.7.2 "Type specifiers".
  */
 static void
 dcs_merge_declaration_specifiers(void)
+{
 	tspec_t t = dcs->d_abstract_type;
 	tspec_t c = dcs->d_complex_mod;
 	tspec_t s = dcs->d_sign_mod;
 	tspec_t l = dcs->d_rank_mod;
 	type_t *tp = dcs->d_type;
 	if (tp != NULL) {
 		lint_assert(t == NO_TSPEC);
 		lint_assert(s == NO_TSPEC);
 		lint_assert(l == NO_TSPEC);
 		return;
+	}
 	debug_step("%s: %s", __func__, type_name(tp));
 	if (t == NO_TSPEC && s == NO_TSPEC && l == NO_TSPEC && c == NO_TSPEC)
 		dcs->d_no_type_specifier = true;
 	if (t == NO_TSPEC && s == NO_TSPEC && (l == NO_TSPEC || l == LONG))
 		t = c;
 	if (t == NO_TSPEC)
 		t = INT;
 	if (s == NO_TSPEC && t == INT)
 		s = SIGNED;
 	if (l != NO_TSPEC && t == CHAR) {
 		dcs->d_invalid_type_combination = true;
 		l = NO_TSPEC;
+	}
 	if (l == LONG && t == FLOAT) {
 		l = NO_TSPEC;
 		t = DOUBLE;
 		if (allow_c90)
 			/* use 'double' instead of 'long float' */
 			warning(6);
+	}
 	if ((l == LONG && t == DOUBLE) || t == LDOUBLE) {
 		l = NO_TSPEC;
 		t = LDOUBLE;
+	}
 	if (t == LDOUBLE && !allow_c90) {
 		/* 'long double' is illegal in traditional C */
 		warning(266);
+	}
 	if (l == LONG && t == DCOMPLEX) {
 		l = NO_TSPEC;
 		t = LCOMPLEX;
+	}
 	if (t != INT && t != CHAR && (s != NO_TSPEC || l != NO_TSPEC)) {
 		dcs->d_invalid_type_combination = true;
 		l = s = NO_TSPEC;
+	}
 	if (l != NO_TSPEC)
 		t = l;
 	dcs->d_type = gettyp(merge_signedness(t, s));
+}
 /* Create a type in 'dcs->d_type' from the information gathered in 'dcs'. */
 void
 dcs_end_type(void)
+{
 	dcs_merge_declaration_specifiers();
 	if (dcs->d_multiple_storage_classes) {
 		/* only one storage class allowed */
 		error(7);
+	}
 	if (dcs->d_invalid_type_combination) {
 		/* illegal type combination */
 		error(4);
+	}
 	dcs_adjust_storage_class();
 	if (dcs->d_qual.tq_const && dcs->d_type->t_const
 	    && !dcs->d_type->t_typeof) {
 		lint_assert(dcs->d_type->t_typedef);
 		/* typedef already qualified with '%s' */
 		warning(68, "const");
+	}
 	if (dcs->d_qual.tq_volatile && dcs->d_type->t_volatile &&
 	    !dcs->d_type->t_typeof) {
 		lint_assert(dcs->d_type->t_typedef);
 		/* typedef already qualified with '%s' */
 		warning(68, "volatile");
+	}
 	if (dcs->d_qual.tq_const || dcs->d_qual.tq_volatile) {
 		dcs->d_type = block_dup_type(dcs->d_type);
 		dcs->d_type->t_const |= dcs->d_qual.tq_const;
 		dcs->d_type->t_volatile |= dcs->d_qual.tq_volatile;
+	}
 	debug_leave();
+}
 /*
  * Return the length of a type in bits. For bit-fields, return the length of
  * the underlying storage type.
+ *
  * Printing a message if the outermost dimension of an array is 0 must
  * be done by the caller. All other problems are reported by this function
  * if name is not NULL.
  */
 int
 length_in_bits(const type_t *tp, const char *name)
+{
 	if (tp == NULL)
 		return -1;
 	unsigned int elem = 1;
 	while (tp->t_tspec == ARRAY) {
 		elem *= tp->t_dim;
 		tp = tp->t_subt;
+	}
 	if (is_struct_or_union(tp->t_tspec)) {
 		if (is_incomplete(tp) && name != NULL) {
 			/* '%s' has incomplete type '%s' */
 			error(31, name, type_name(tp));
+		}
 		return (int)(elem * tp->t_sou->sou_size_in_bits);
+	}
 	if (tp->t_tspec == ENUM && is_incomplete(tp) && name != NULL)
 		/* incomplete enum type '%s' */
 		warning(13, name);
 	lint_assert(tp->t_tspec != FUNC);
 	unsigned int elsz = size_in_bits(tp->t_tspec);
 	/*
 	 * Workaround until the type parser (see add_function, add_array,
 	 * add_pointer) does not construct the invalid intermediate declaration
 	 * 'void b[4]' for the legitimate declaration 'void *b[4]'.
 	 */
 	if (sytxerr > 0 && elsz == 0)
 		elsz = CHAR_SIZE;
 	lint_assert(elsz > 0);
 	return (int)(elem * elsz);
+}
 unsigned int
 alignment_in_bits(const type_t *tp)
+{
 	/* Super conservative so that it works for most systems. */
 	unsigned int worst_align_in_bits = 2 * LONG_SIZE;
 	while (tp->t_tspec == ARRAY)
 		tp = tp->t_subt;
 	tspec_t t = tp->t_tspec;
 	unsigned int a;
 	if (is_struct_or_union(t))
 		a = tp->t_sou->sou_align_in_bits;
 	else {
 		lint_assert(t != FUNC);
 		if ((a = size_in_bits(t)) == 0)
 			a = CHAR_SIZE;
 		else if (a > worst_align_in_bits)
 			a = worst_align_in_bits;
+	}
 	lint_assert(a >= CHAR_SIZE);
 	lint_assert(a <= worst_align_in_bits);
 	return a;
+}
 /*
  * Concatenate two lists of symbols by s_next. Used by declarations of
  * struct/union/enum elements and parameters.
  */
 sym_t *
 concat_symbols(sym_t *l1, sym_t *l2)
+{
 	if (l1 == NULL)
 		return l2;
 	sym_t *l = l1;
 	while (l->s_next != NULL)
 		l = l->s_next;
 	l->s_next = l2;
 	return l1;
+}
 /*
  * Check if the type of the given symbol is valid.
+ *
  * Invalid types are:
  * - arrays of incomplete types or functions
  * - functions returning arrays or functions
  * - void types other than type of function or pointer
  */
 void
 check_type(sym_t *sym)
+{
 	type_t **tpp = &sym->s_type;
 	tspec_t to = NO_TSPEC;
 	while (*tpp != NULL) {
 		type_t *tp = *tpp;
 		tspec_t t = tp->t_tspec;
 		/*
 		 * If this is the type of an old-style function definition,
 		 * a better warning is printed in begin_function().
 		 */
 		if (t == FUNC && !tp->t_proto &&
 		    !(to == NO_TSPEC && sym->s_osdef)) {
 			/* TODO: Make this an error in C99 mode as well. */
 			if ((!allow_trad && !allow_c99) && hflag)
 				/* function declaration is not a prototype */
 				warning(287);
+		}
 		if (to == FUNC) {
 			if (t == FUNC || t == ARRAY) {
 				/* function returns illegal type '%s' */
 				error(15, type_name(tp));
 				*tpp = block_derive_type(
 				    t == FUNC ? *tpp : (*tpp)->t_subt, PTR);
 				return;
+			}
 			if (tp->t_const || tp->t_volatile) {
 				/* TODO: Make this a warning in C99 mode as well. */
 				if (!allow_trad && !allow_c99) {	/* XXX or better allow_c90? */
 					/* function cannot return const... */
 					warning(228);
+				}
+			}
 		} else if (to == ARRAY) {
 			if (t == FUNC) {
 				/* array of function is illegal */
 				error(16);
 				*tpp = gettyp(INT);
 				return;
+			}
 			if (t == ARRAY && tp->t_dim == 0) {
 				/* null dimension */
 				error(17);
 				return;
+			}
 			if (t == VOID) {
 				/* illegal use of 'void' */
 				error(18);
 				*tpp = gettyp(INT);
+			}
 			/*
 			 * No need to check for incomplete types here as
 			 * length_in_bits already does this.
 			 */
 		} else if (to == NO_TSPEC && t == VOID) {
 			if (dcs->d_kind == DLK_PROTO_PARAMS) {
 				if (sym->s_scl != ABSTRACT) {
 					lint_assert(sym->s_name != unnamed);
 					/* void parameter '%s' cannot ... */
 					error(61, sym->s_name);
 					*tpp = gettyp(INT);
+				}
 			} else if (dcs->d_kind == DLK_ABSTRACT) {
 				/* ok */
 			} else if (sym->s_scl != TYPEDEF) {
 				/* void type for '%s' */
 				error(19, sym->s_name);
 				*tpp = gettyp(INT);
+			}
+		}
 		if (t == VOID && to != PTR) {
 			if (tp->t_const || tp->t_volatile) {
 				/* inappropriate qualifiers with 'void' */
 				warning(69);
 				tp->t_const = tp->t_volatile = false;
+			}
+		}
 		tpp = &tp->t_subt;
 		to = t;
+	}
+}
 /*
  * In traditional C, the only portable type for bit-fields is unsigned int.
+ *
  * In C90, the only allowed types for bit-fields are int, signed int and
  * unsigned int (3.5.2.1).  There is no mention of implementation-defined
  * types.
+ *
  * In C99, the only portable types for bit-fields are _Bool, signed int and
  * unsigned int (6.7.2.1p4).  In addition, C99 allows "or some other
  * implementation-defined type".
  */
 static void
 check_bit_field_type(sym_t *dsym, type_t **const inout_tp, tspec_t *inout_t)
+{
 	type_t *tp = *inout_tp;
 	tspec_t t = *inout_t;
 	if (t == CHAR || t == UCHAR || t == SCHAR ||
 	    t == SHORT || t == USHORT || t == ENUM) {
 		if (!suppress_bitfieldtype) {
 			/* TODO: Make this an error in C99 mode as well. */
 			if (!allow_trad && !allow_c99) {
 				type_t *btp = block_dup_type(tp);
 				btp->t_bitfield = false;
 				/* bit-field type '%s' invalid in ANSI C */
 				warning(273, type_name(btp));
 			} else if (pflag) {
 				type_t *btp = block_dup_type(tp);
 				btp->t_bitfield = false;
 				/* nonportable bit-field type '%s' */
 				warning(34, type_name(btp));
+			}
+		}
 	} else if (t == INT && dcs->d_sign_mod == NO_TSPEC) {
 		if (pflag && !suppress_bitfieldtype) {
 			/* bit-field of type plain 'int' has ... */
 			warning(344);
+		}
 	} else if (!(t == INT || t == UINT || t == BOOL
 		|| (is_integer(t) && (suppress_bitfieldtype || allow_gcc)))) {
 		type_t *btp = block_dup_type(tp);
 		btp->t_bitfield = false;
 		/* illegal bit-field type '%s' */
 		warning(35, type_name(btp));
 		unsigned int width = tp->t_bit_field_width;
 		dsym->s_type = tp = block_dup_type(gettyp(t = INT));
 		if ((tp->t_bit_field_width = width) > size_in_bits(t))
 			tp->t_bit_field_width = size_in_bits(t);
 		*inout_t = t;
 		*inout_tp = tp;
+	}
+}
 static void
 check_bit_field(sym_t *dsym, tspec_t *inout_t, type_t **const inout_tp)
+{
 	check_bit_field_type(dsym, inout_tp, inout_t);
 	type_t *tp = *inout_tp;
 	tspec_t t = *inout_t;
 	unsigned int t_width = size_in_bits(t);
 	if (tp->t_bit_field_width > t_width) {
 		/* illegal bit-field size: %d */
 		error(36, (int)tp->t_bit_field_width);
 		tp->t_bit_field_width = t_width;
 	} else if (tp->t_bit_field_width == 0 && dsym->s_name != unnamed) {
 		/* zero size bit-field */
 		error(37);
 		tp->t_bit_field_width = t_width;
+	}
 	if (dsym->s_scl == UNION_MEMBER) {
 		/* bit-field in union is very unusual */
 		warning(41);
 		dsym->s_type->t_bitfield = false;
 		dsym->s_bitfield = false;
+	}
+}
 /* Aligns the next structure element as required. */
 static void
 dcs_align(unsigned int member_alignment, unsigned int bit_field_width)
+{
 	if (member_alignment > dcs->d_sou_align_in_bits)
 		dcs->d_sou_align_in_bits = member_alignment;
 	unsigned int offset = (dcs->d_sou_size_in_bits + member_alignment - 1)
 	    & ~(member_alignment - 1);
 	if (bit_field_width == 0
 	    || dcs->d_sou_size_in_bits + bit_field_width > offset)
 		dcs->d_sou_size_in_bits = offset;
+}
 /* Add a member to the struct or union type that is being built in 'dcs'. */
 static void
 dcs_add_member(sym_t *mem)
+{
 	type_t *tp = mem->s_type;
 	unsigned int union_size = 0;
 	if (dcs->d_kind == DLK_UNION) {
 		union_size = dcs->d_sou_size_in_bits;
 		dcs->d_sou_size_in_bits = 0;
+	}
 	if (mem->s_bitfield) {
 		dcs_align(alignment_in_bits(tp), tp->t_bit_field_width);
 		// XXX: Why round down?
 		mem->u.s_member.sm_offset_in_bits = dcs->d_sou_size_in_bits
 		    - dcs->d_sou_size_in_bits % size_in_bits(tp->t_tspec);
 		tp->t_bit_field_offset = dcs->d_sou_size_in_bits
 		    - mem->u.s_member.sm_offset_in_bits;
 		dcs->d_sou_size_in_bits += tp->t_bit_field_width;
 	} else {
 		dcs_align(alignment_in_bits(tp), 0);
 		mem->u.s_member.sm_offset_in_bits = dcs->d_sou_size_in_bits;
 		dcs->d_sou_size_in_bits += type_size_in_bits(tp);
+	}
 	if (union_size > dcs->d_sou_size_in_bits)
 		dcs->d_sou_size_in_bits = union_size;
+}
 sym_t *
 declare_unnamed_member(void)
+{
 	sym_t *mem = block_zero_alloc(sizeof(*mem), "sym");
 	mem->s_name = unnamed;
 	mem->s_kind = FMEMBER;
 	mem->s_scl = dcs->d_kind == DLK_STRUCT ? STRUCT_MEMBER : UNION_MEMBER;
 	mem->s_block_level = -1;
 	mem->s_type = dcs->d_type;
 	mem->u.s_member.sm_containing_type = dcs->d_tag_type->t_sou;
 	dcs_add_member(mem);
 	suppress_bitfieldtype = false;
 	return mem;
+}
 sym_t *
 declare_member(sym_t *dsym)
+{
 	lint_assert(is_member(dsym));
 	if (dcs->d_redeclared_symbol != NULL) {
 		lint_assert(is_member(dcs->d_redeclared_symbol));
 		if (dsym->u.s_member.sm_containing_type ==
 		    dcs->d_redeclared_symbol->u.s_member.sm_containing_type) {
 			/* duplicate member name '%s' */
 			error(33, dsym->s_name);
 			rmsym(dcs->d_redeclared_symbol);
+		}
+	}
 	check_type(dsym);
 	type_t *tp = dsym->s_type;
 	tspec_t t = tp->t_tspec;
 	if (dsym->s_bitfield)
 		check_bit_field(dsym, &t, &tp);
 	else if (t == FUNC) {
 		/* function illegal in structure or union */
 		error(38);
 		dsym->s_type = tp = block_derive_type(tp, t = PTR);
+	}
 	/*
 	 * bit-fields of length 0 are not warned about because length_in_bits
 	 * does not return the length of the bit-field but the length
 	 * of the type the bit-field is packed in (it's ok)
 	 */
 	int sz = length_in_bits(dsym->s_type, dsym->s_name);
 	if (sz == 0 && t == ARRAY && dsym->s_type->t_dim == 0) {
 		/* zero-sized array '%s' in struct is a C99 extension */
 		c99ism(39, dsym->s_name);
+	}
 	dcs_add_member(dsym);
 	check_function_definition(dsym, false);
 	suppress_bitfieldtype = false;
 	return dsym;
+}
 sym_t *
 set_bit_field_width(sym_t *dsym, int bit_field_width)
+{
 	if (dsym == NULL) {
 		dsym = block_zero_alloc(sizeof(*dsym), "sym");
 		dsym->s_name = unnamed;
 		dsym->s_kind = FMEMBER;
 		dsym->s_scl = STRUCT_MEMBER;
 		dsym->s_type = gettyp(UINT);
 		dsym->s_block_level = -1;
+	}
 	dsym->s_type = block_dup_type(dsym->s_type);
 	dsym->s_type->t_bitfield = true;
 	dsym->s_type->t_bit_field_width = bit_field_width;
 	dsym->s_bitfield = true;
 	return dsym;
+}
 void
 add_type_qualifiers(type_qualifiers *dst, type_qualifiers src)
+{
 	if (src.tq_const && dst->tq_const)
 		/* duplicate '%s' */
 		warning(10, "const");
 	if (src.tq_volatile && dst->tq_volatile)
 		/* duplicate '%s' */
 		warning(10, "volatile");
 	dst->tq_const = dst->tq_const | src.tq_const;
 	dst->tq_restrict = dst->tq_restrict | src.tq_restrict;
 	dst->tq_volatile = dst->tq_volatile | src.tq_volatile;
 	dst->tq_atomic = dst->tq_atomic | src.tq_atomic;
+}
 qual_ptr *
 append_qualified_pointer(qual_ptr *p1, qual_ptr *p2)
+{
 	qual_ptr *tail = p2;
 	while (tail->p_next != NULL)
 		tail = tail->p_next;
 	tail->p_next = p1;
 	return p2;
+}
 static type_t *
 block_derive_pointer(type_t *stp, bool is_const, bool is_volatile)
+{
 	type_t *tp = block_derive_type(stp, PTR);
 	tp->t_const = is_const;
 	tp->t_volatile = is_volatile;
 	return tp;
+}
 /*
  * The following 3 functions extend the type of a declarator with
  * pointer, function and array types.
+ *
  * The current type is the type built by dcs_end_type (dcs->d_type) and
  * pointer, function and array types already added for this
  * declarator. The new type extension is inserted between both.
  */
 sym_t *
 add_pointer(sym_t *decl, qual_ptr *p)
+{
 	debug_dcs(false);
 	type_t **tpp = &decl->s_type;
 	while (*tpp != NULL && *tpp != dcs->d_type)
 		tpp = &(*tpp)->t_subt;
 	if (*tpp == NULL) {
 		debug_step("add_pointer: unchanged '%s'",
 		    type_name(decl->s_type));
 		return decl;
+	}
 	while (p != NULL) {
 		*tpp = block_derive_pointer(dcs->d_type,
 		    p->qualifiers.tq_const, p->qualifiers.tq_volatile);
 		tpp = &(*tpp)->t_subt;
 		qual_ptr *next = p->p_next;
 		free(p);
 		p = next;
+	}
 	debug_step("add_pointer: '%s'", type_name(decl->s_type));
 	return decl;
+}
 static type_t *
 block_derive_array(type_t *stp, bool dim, int len)
+{
 	type_t *tp = block_derive_type(stp, ARRAY);
 	tp->t_dim = len;
 #if 0
 	/*
 	 * As of 2022-04-03, the implementation of the type parser (see
 	 * add_function, add_array, add_pointer) is strange.  When it sees
 	 * the type 'void *b[4]', it first creates 'void b[4]' and only later
 	 * inserts the '*' in the middle of the type.  Late modifications like
 	 * these should not be done at all, instead the parser should be fixed
 	 * to process the type names in the proper syntactical order.
+	 *
 	 * Since the intermediate type would be an array of void, but the
 	 * final type is valid, this check cannot be enabled yet.
 	 */
 	if (stp->t_tspec == VOID) {
 		/* array of incomplete type */
 		error(301);
 		tp->t_subt = gettyp(CHAR);
+	}
 #endif
 	if (len < 0) {
 		/* negative array dimension (%d) */
 		error(20, len);
 	} else if (len == 0 && dim) {
 		/* zero sized array is a C99 extension */
 		c99ism(322);
 	} else if (len == 0 && !dim)
 		tp->t_incomplete_array = true;
 	return tp;
+}
 /*
  * If a dimension was specified, dim is true, otherwise false
  * n is the specified dimension
  */
 sym_t *
 add_array(sym_t *decl, bool dim, int n)
+{
 	debug_dcs(false);
 	type_t **tpp = &decl->s_type;
 	while (*tpp != NULL && *tpp != dcs->d_type)
 		tpp = &(*tpp)->t_subt;
 	if (*tpp == NULL) {
 		debug_step("add_array: unchanged '%s'",
 		    type_name(decl->s_type));
 		return decl;
+	}
 	*tpp = block_derive_array(dcs->d_type, dim, n);
 	debug_step("add_array: '%s'", type_name(decl->s_type));
 	return decl;
+}
 static type_t *
 block_derive_function(type_t *ret, bool proto, sym_t *args, bool vararg)
+{
 	type_t *tp = block_derive_type(ret, FUNC);
 	tp->t_proto = proto;
 	if (proto)
 		tp->t_args = args;
 	tp->t_vararg = vararg;
 	return tp;
+}
 static void
 check_prototype_parameters(sym_t *args)
+{
 	for (sym_t *sym = dcs->d_first_dlsym;
 	     sym != NULL; sym = sym->s_level_next) {
 		scl_t sc = sym->s_scl;
 		if (sc == STRUCT_TAG || sc == UNION_TAG || sc == ENUM_TAG) {
 			/* dubious tag declaration '%s %s' */
 			warning(85, storage_class_name(sc), sym->s_name);
+		}
+	}