 @@ -1,1039 +1,1039 @@
-/*	$NetBSD: tree.c,v 1.123 2021/01/04 15:52:51 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.124 2021/01/04 17:06:20 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.
  * 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) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.123 2021/01/04 15:52:51 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.124 2021/01/04 17:06:20 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);
 static	void	check_pointer_comparison(op_t, tnode_t *, tnode_t *);
 static	int	check_assign_types_compatible(op_t, int, tnode_t *, tnode_t *);
 static	void	check_bad_enum_operation(op_t, tnode_t *, tnode_t *);
 static	void	check_enum_type_mismatch(op_t, int, tnode_t *, tnode_t *);
 static	void	check_enum_int_mismatch(op_t, int, tnode_t *, tnode_t *);
 static	tnode_t	*new_tnode(op_t, type_t *, tnode_t *, tnode_t *);
 static	void	balance(op_t, tnode_t **, tnode_t **);
 static	void	warn_incompatible_types(op_t, tspec_t, tspec_t);
 static	void	warn_incompatible_pointers(mod_t *, type_t *, type_t *);
 static	void	merge_qualifiers(type_t **, type_t *, type_t *);
 static	int	has_constant_member(type_t *);
 static	void	check_prototype_conversion(int, tspec_t, tspec_t, type_t *,
 					   tnode_t *);
 static	void	check_integer_conversion(op_t, int, tspec_t, tspec_t, type_t *,
 					 tnode_t *);
 static	void	check_pointer_integer_conversion(op_t, tspec_t, type_t *,
 						 tnode_t *);
 static	void	check_pointer_conversion(op_t, tnode_t *, type_t *);
 static	tnode_t	*build_struct_access(op_t, tnode_t *, tnode_t *);
 static	tnode_t	*build_prepost_incdec(op_t, tnode_t *);
 static	tnode_t	*build_real_imag(op_t, tnode_t *);
 static	tnode_t	*build_ampersand(tnode_t *, int);
 static	tnode_t	*build_plus_minus(op_t, tnode_t *, tnode_t *);
 static	tnode_t	*build_bit_shift(op_t, tnode_t *, tnode_t *);
 static	tnode_t	*build_colon(tnode_t *, tnode_t *);
 static	tnode_t	*build_assignment(op_t, tnode_t *, tnode_t *);
 static	tnode_t	*plength(type_t *);
 static	tnode_t	*fold(tnode_t *);
 static	tnode_t	*fold_test(tnode_t *);
 static	tnode_t	*fold_float(tnode_t *);
 static	tnode_t	*check_function_arguments(type_t *, tnode_t *);
 static	tnode_t	*check_prototype_argument(int, type_t *, tnode_t *);
 static	void	check_null_effect(tnode_t *);
 static	void	display_expression(tnode_t *, int);
 static	void	check_array_index(tnode_t *, int);
 static	void	check_integer_comparison(op_t, tnode_t *, tnode_t *);
 static	void	check_precedence_confusion(tnode_t *);
 extern sig_atomic_t fpe;
 #if 0
 static char *
 dumpnode(char *buf, size_t len, tnode_t *tn) {
 	const char *n = getopname(tn->tn_op);
 	const char *s;
 	switch (tn->tn_op) {
 	case NAME:
 		s = tn->tn_sym->s_name;
 		break;
 	case CON:
 	case STRING:
 		s = "*";	/* todo */
 		break;
 	default:
 		s = NULL;
 		break;
+	}
 	char lb[1024];
 	char rb[1024];
 	if (s == NULL && tn->tn_left != NULL)
 		dumpnode(lb, sizeof(lb), tn->tn_left);
 	else
 		strcpy(lb, "(null)");
 	if (s == NULL && tn->tn_right != NULL)
 		dumpnode(rb, sizeof(rb), tn->tn_right);
 	else
 		strcpy(rb, "(null)");
 	snprintf(buf, len, "%s: (%s) = %s [%s, %s]", n,
 	    type_name(tn->tn_type), s, lb, rb);
 	return buf;
+}
 #endif
 /*
  * Increase degree of reference.
  * This is most often used to change type "T" in type "pointer to T".
  */
 type_t *
 incref(type_t *tp, tspec_t t)
+{
 	type_t	*tp2;
 	tp2 = getblk(sizeof (type_t));
 	tp2->t_tspec = t;
 	tp2->t_subt = tp;
 	return tp2;
+}
 /*
  * same for use in expressions
  */
 type_t *
 tincref(type_t *tp, tspec_t t)
+{
 	type_t	*tp2;
 	tp2 = tgetblk(sizeof (type_t));
 	tp2->t_tspec = t;
 	tp2->t_subt = tp;
 	return tp2;
+}
 /*
  * Create a node for a constant.
  */
 tnode_t *
 new_constant_node(type_t *tp, val_t *v)
+{
 	tnode_t	*n;
 	n = getnode();
 	n->tn_op = CON;
 	n->tn_type = tp;
 	n->tn_val = tgetblk(sizeof (val_t));
 	n->tn_val->v_tspec = tp->t_tspec;
 	n->tn_val->v_ansiu = v->v_ansiu;
 	n->tn_val->v_u = v->v_u;
 	free(v);
 	return n;
+}
 static tnode_t *
 new_integer_constant_node(tspec_t t, int64_t q)
+{
 	tnode_t	*n;
 	n = getnode();
 	n->tn_op = CON;
 	n->tn_type = gettyp(t);
 	n->tn_val = tgetblk(sizeof (val_t));
 	n->tn_val->v_tspec = t;
 	n->tn_val->v_quad = q;
 	return n;
+}
 /*
  * Create a node for a name (symbol table entry).
  * ntok is the token which follows the name.
  */
 tnode_t *
 new_name_node(sym_t *sym, int ntok)
+{
 	tnode_t	*n;
 	if (sym->s_scl == NOSCL) {
 		sym->s_scl = EXTERN;
 		sym->s_def = DECL;
 		if (ntok == T_LPAREN) {
 			if (sflag) {
 				/* function implicitly declared to ... */
 				warning(215);
+			}
 			/*
 			 * XXX if tflag is set the symbol should be
 			 * exported to level 0
 			 */
 			sym->s_type = incref(sym->s_type, FUNC);
 		} else {
 			if (!blklev) {
 				/* %s undefined */
 				error(99, sym->s_name);
 			} else {
 				int fixtype;
 				if (strcmp(sym->s_name, "__FUNCTION__") == 0 ||
 				    strcmp(sym->s_name, "__PRETTY_FUNCTION__")
 				    == 0) {
 					/* __FUNCTION__/__PRETTY_FUNCTION... */
 					gnuism(316);
 					fixtype = 1;
 				} else if (strcmp(sym->s_name, "__func__") == 0) {
 					if (!Sflag)
 						/* __func__ is a C9X feature */
 						warning(317);
 					fixtype = 1;
 				} else {
 					/* %s undefined */
 					error(99, sym->s_name);
 					fixtype = 0;
+				}
 				if (fixtype) {
 					sym->s_type = incref(gettyp(CHAR), PTR);
 					sym->s_type->t_const = 1;
+				}
+			}
+		}
+	}
 	if (sym->s_kind != FVFT && sym->s_kind != FMEMBER)
 		LERROR("new_name_node(%d)", sym->s_kind);
 	n = getnode();
 	n->tn_type = sym->s_type;
 	if (sym->s_scl != ENUMCON) {
 		n->tn_op = NAME;
 		n->tn_sym = sym;
 		if (sym->s_kind == FVFT && sym->s_type->t_tspec != FUNC)
 			n->tn_lvalue = 1;
 	} else {
 		n->tn_op = CON;
 		n->tn_val = tgetblk(sizeof (val_t));
 		*n->tn_val = sym->s_value;
+	}
 	return n;
+}
 tnode_t *
 new_string_node(strg_t *strg)
+{
 	size_t	len;
 	tnode_t	*n;
 	len = strg->st_len;
 	n = getnode();
 	n->tn_op = STRING;
 	n->tn_type = tincref(gettyp(strg->st_tspec), ARRAY);
 	n->tn_type->t_dim = len + 1;
 	n->tn_lvalue = 1;
 	n->tn_string = tgetblk(sizeof (strg_t));
 	n->tn_string->st_tspec = strg->st_tspec;
 	n->tn_string->st_len = len;
 	if (strg->st_tspec == CHAR) {
 		n->tn_string->st_cp = tgetblk(len + 1);
 		(void)memcpy(n->tn_string->st_cp, strg->st_cp, len + 1);
 		free(strg->st_cp);
 	} else {
 		n->tn_string->st_wcp = tgetblk((len + 1) * sizeof (wchar_t));
 		(void)memcpy(n->tn_string->st_wcp, strg->st_wcp,
 			     (len + 1) * sizeof (wchar_t));
 		free(strg->st_wcp);
+	}
 	free(strg);
 	return n;
+}
 /*
  * Returns a symbol which has the same name as the msym argument and is a
  * member of the struct or union specified by the tn argument.
  */
 sym_t *
 struct_or_union_member(tnode_t *tn, op_t op, sym_t *msym)
+{
 	str_t	*str;
 	type_t	*tp;
 	sym_t	*sym, *csym;
 	int	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 */
 		error(101, msym->s_name);
 		rmsym(msym);
 		msym->s_kind = FMEMBER;
 		msym->s_scl = MOS;
 		msym->s_styp = tgetblk(sizeof (str_t));
 		msym->s_styp->stag = tgetblk(sizeof (sym_t));
 		msym->s_styp->stag->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;
 	if (op == POINT) {
 		if (t == STRUCT || t == UNION)
 			str = tp->t_str;
 	} else if (op == ARROW && t == PTR) {
 		t = (tp = tp->t_subt)->t_tspec;
 		if (t == STRUCT || t == UNION)
 			str = tp->t_str;
+	}
 	/*
 	 * If this struct/union has a member with the name of msym, return
 	 * return this it.
 	 */
 	if (str != NULL) {
 		for (sym = msym; sym != NULL; sym = sym->s_link) {
 			if (sym->s_scl != MOS && sym->s_scl != MOU)
 				continue;
 			if (sym->s_styp != str)
 				continue;
 			if (strcmp(sym->s_name, msym->s_name) != 0)
 				continue;
 			return sym;
+		}
+	}
 	/*
 	 * Set eq to 0 if there are struct/union members with the same name
 	 * and different types and/or offsets.
 	 */
 	eq = 1;
 	for (csym = msym; csym != NULL; csym = csym->s_link) {
 		if (csym->s_scl != MOS && csym->s_scl != MOU)
 			continue;
 		if (strcmp(msym->s_name, csym->s_name) != 0)
 			continue;
 		for (sym = csym->s_link ; sym != NULL; sym = sym->s_link) {
 			int w;
 			if (sym->s_scl != MOS && sym->s_scl != MOU)
 				continue;
 			if (strcmp(csym->s_name, sym->s_name) != 0)
 				continue;
 			if (csym->s_value.v_quad != sym->s_value.v_quad) {
 				eq = 0;
 				break;
+			}
 			w = 0;
 			eq = eqtype(csym->s_type, sym->s_type, 0, 0, &w) && !w;
 			if (!eq)
 				break;
 			if (csym->s_bitfield != sym->s_bitfield) {
 				eq = 0;
 				break;
+			}
 			if (csym->s_bitfield) {
 				type_t	*tp1, *tp2;
 				tp1 = csym->s_type;
 				tp2 = sym->s_type;
 				if (tp1->t_flen != tp2->t_flen) {
 					eq = 0;
 					break;
+				}
 				if (tp1->t_foffs != tp2->t_foffs) {
 					eq = 0;
 					break;
+				}
+			}
+		}
 		if (!eq)
 			break;
+	}
 	/*
 	 * Now handle the case in which the left operand refers really
 	 * to a struct/union, but the right operand is not member of it.
 	 */
 	if (str != NULL) {
 		if (eq && tflag) {
 			/* illegal member use: %s */
 			warning(102, msym->s_name);
 		} else {
 			/* illegal member use: %s */
 			error(102, msym->s_name);
+		}
 		return msym;
+	}
 	/*
 	 * Now the left operand of ARROW does not point to a struct/union
 	 * or the left operand of POINT is no struct/union.
 	 */
 	if (eq) {
 		if (op == POINT) {
 			if (tflag) {
 				/* left operand of '.' must be struct/... */
 				warning(103);
 			} else {
 				/* left operand of '.' must be struct/... */
 				error(103);
+			}
 		} else {
 			/* left operand of "->" must be pointer to ... */
 			if (tflag && tn->tn_type->t_tspec == PTR) {
 				/* left operand of '->' must be pointer ... */
 				warning(104, type_name(tn->tn_type));
 			} else {
 				/* left operand of '->' must be pointer ... */
 				error(104, type_name(tn->tn_type));
+			}
+		}
 	} else {
 		if (tflag) {
 			/* non-unique member requires struct/union %s */
 			error(105, op == POINT ? "object" : "pointer");
 		} else {
 			/* unacceptable operand of '%s' */
 			error(111, modtab[op].m_name);
+		}
+	}
 	return msym;
+}
 /*
  * Create a tree node. Called for most operands except function calls,
  * sizeof and casts.
+ *
  * op	operator
  * ln	left operand
  * rn	if not NULL, right operand
  */
 tnode_t *
 build(op_t op, tnode_t *ln, tnode_t *rn)
+{
 	mod_t	*mp;
 	tnode_t	*ntn;
 	type_t	*rtp;
 	mp = &modtab[op];
 	/* If there was an error in one of the operands, return. */
 	if (ln == NULL || (mp->m_binary && rn == NULL))
 		return NULL;
 	/*
 	 * Apply class conversions to the left operand, but only if its
 	 * value is needed or it is compared with null.
 	 */
 	if (mp->m_vctx || mp->m_tctx)
 		ln = cconv(ln);
 	/*
 	 * The right operand is almost always in a test or value context,
 	 * except if it is a struct or union member.
 	 */
 	if (mp->m_binary && op != ARROW && op != POINT)
 		rn = cconv(rn);
 	/*
 	 * Print some warnings for comparisons of unsigned values with
 	 * constants lower than or equal to null. This must be done
 	 * before promote() because otherwise unsigned char and unsigned
 	 * short would be promoted to int. Also types are tested to be
 	 * CHAR, which would also become int.
 	 */
 	if (mp->m_comp)
 		check_integer_comparison(op, ln, rn);
 	/*
 	 * Promote the left operand if it is in a test or value context
 	 */
 	if (mp->m_vctx || mp->m_tctx)
 		ln = promote(op, 0, ln);
 	/*
 	 * Promote the right operand, but only if it is no struct or
 	 * union member, or if it is not to be assigned to the left operand
 	 */
 	if (mp->m_binary && op != ARROW && op != POINT &&
 	    op != ASSIGN && op != RETURN) {
 		rn = promote(op, 0, rn);
+	}
 	/*
 	 * If the result of the operation is different for signed or
 	 * unsigned operands and one of the operands is signed only in
 	 * ANSI C, print a warning.
 	 */
 	if (mp->m_tlansiu && ln->tn_op == CON && ln->tn_val->v_ansiu) {
 		/* ANSI C treats constant as unsigned, op %s */
 		warning(218, mp->m_name);
 		ln->tn_val->v_ansiu = 0;
+	}
 	if (mp->m_transiu && rn->tn_op == CON && rn->tn_val->v_ansiu) {
 		/* ANSI C treats constant as unsigned, op %s */
 		warning(218, mp->m_name);
 		rn->tn_val->v_ansiu = 0;
+	}
 	/* Make sure both operands are of the same type */
 	if (mp->m_balance || (tflag && (op == SHL || op == SHR)))
 		balance(op, &ln, &rn);
 	/*
 	 * Check types for compatibility with the operation and mutual
 	 * compatibility. Return if there are serious problems.
 	 */
 	if (!typeok(op, 0, ln, rn))
 		return NULL;
 	/* And now create the node. */
 	switch (op) {
 	case POINT:
 	case ARROW:
 		ntn = build_struct_access(op, ln, rn);
 		break;
 	case INCAFT:
 	case DECAFT:
 	case INCBEF:
 	case DECBEF:
 		ntn = build_prepost_incdec(op, ln);
 		break;
 	case AMPER:
 		ntn = build_ampersand(ln, 0);
 		break;
 	case STAR:
 		ntn = new_tnode(STAR, ln->tn_type->t_subt, ln, NULL);
 		break;
 	case PLUS:
 	case MINUS:
 		ntn = build_plus_minus(op, ln, rn);
 		break;
 	case SHL:
 	case SHR:
 		ntn = build_bit_shift(op, ln, rn);
 		break;
 	case COLON:
 		ntn = build_colon(ln, rn);
 		break;
 	case ASSIGN:
 	case MULASS:
 	case DIVASS:
 	case MODASS:
 	case ADDASS:
 	case SUBASS:
 	case SHLASS:
 	case SHRASS:
 	case ANDASS:
 	case XORASS:
 	case ORASS:
 	case RETURN:
 		ntn = build_assignment(op, ln, rn);
 		break;
 	case COMMA:
 	case QUEST:
 		ntn = new_tnode(op, rn->tn_type, ln, rn);
 		break;
 	case REAL:
 	case IMAG:
 		ntn = build_real_imag(op, ln);
 		break;
 	default:
 		rtp = mp->m_logical ? gettyp(INT) : ln->tn_type;
 		lint_assert(mp->m_binary || rn == NULL);
 		ntn = new_tnode(op, rtp, ln, rn);
 		break;
+	}
 	/* Return if an error occurred. */
 	if (ntn == NULL)
 		return NULL;
 	/* Print a warning if precedence confusion is possible */
 	if (mp->m_tpconf)
 		check_precedence_confusion(ntn);
 	/*
 	 * Print a warning if one of the operands is in a context where
 	 * it is compared with null and if this operand is a constant.
 	 */
 	if (mp->m_tctx) {
 		if (ln->tn_op == CON ||
 		    ((mp->m_binary && op != QUEST) && rn->tn_op == CON)) {
 			if (hflag && !constcond_flag)
 				/* constant in conditional context */
 				warning(161);
+		}
+	}
 	/* Fold if the operator requires it */
 	if (mp->m_fold) {
 		if (ln->tn_op == CON && (!mp->m_binary || rn->tn_op == CON)) {
 			if (mp->m_tctx) {
 				ntn = fold_test(ntn);
 			} else if (tspec_is_float(ntn->tn_type->t_tspec)) {
 				ntn = fold_float(ntn);
 			} else {
 				ntn = fold(ntn);
+			}
 		} else if (op == QUEST && ln->tn_op == CON) {
 			ntn = ln->tn_val->v_quad ? rn->tn_left : rn->tn_right;
+		}
+	}
 	return ntn;
+}
 /*
  * Perform class conversions.
+ *
  * Arrays of type T are converted into pointers to type T.
  * Functions are converted to pointers to functions.
  * Lvalues are converted to rvalues.
  */
 tnode_t *
 cconv(tnode_t *tn)
+{
 	type_t	*tp;
 	/*
 	 * Array-lvalue (array of type T) is converted into rvalue
 	 * (pointer to type T)
 	 */
 	if (tn->tn_type->t_tspec == ARRAY) {
 		if (!tn->tn_lvalue) {
 			/* XXX print correct operator */
 			/* %soperand of '%s' must be lvalue */
 			gnuism(114, "", modtab[AMPER].m_name);
+		}
 		tn = new_tnode(AMPER, tincref(tn->tn_type->t_subt, PTR),
 			     tn, NULL);
+	}
 	/*
 	 * Expression of type function (function with return value of type T)
 	 * in rvalue-expression (pointer to function with return value
 	 * of type T)
 	 */
 	if (tn->tn_type->t_tspec == FUNC)
 		tn = build_ampersand(tn, 1);
 	/* lvalue to rvalue */
 	if (tn->tn_lvalue) {
 		tp = tduptyp(tn->tn_type);
 		tp->t_const = tp->t_volatile = 0;
 		tn = new_tnode(LOAD, tp, tn, NULL);
+	}
 	return tn;
+}
 /*
  * Perform most type checks. First the types are checked using
  * the information from modtab[]. After that it is done by hand for
  * more complicated operators and type combinations.
+ *
  * If the types are ok, typeok() returns 1, otherwise 0.
  */
 int
 typeok(op_t op, int arg, tnode_t *ln, tnode_t *rn)
+{
 	mod_t	*mp;
 	tspec_t	lt, rt = NOTSPEC, lst = NOTSPEC, rst = NOTSPEC, olt = NOTSPEC,
 	    ort = NOTSPEC;
 	type_t	*ltp, *rtp = NULL, *lstp = NULL, *rstp = NULL;
 	tnode_t	*tn;
 	mp = &modtab[op];
 	lint_assert((ltp = ln->tn_type) != NULL);
 	if ((lt = ltp->t_tspec) == PTR)
 		lst = (lstp = ltp->t_subt)->t_tspec;
 	if (mp->m_binary) {
 		lint_assert((rtp = rn->tn_type) != NULL);
 		if ((rt = rtp->t_tspec) == PTR)
 			rst = (rstp = rtp->t_subt)->t_tspec;
+	}
 	if (mp->m_requires_integer) {
 		if (!tspec_is_int(lt) || (mp->m_binary && !tspec_is_int(rt))) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
 	} else if (mp->m_requires_integer_or_complex) {
 		if ((!tspec_is_int(lt) && !tspec_is_complex(lt)) ||
 		    (mp->m_binary &&
 		     (!tspec_is_int(rt) && !tspec_is_complex(rt)))) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
 	} else if (mp->m_requires_scalar) {
 		if (!tspec_is_scalar(lt) ||
 		    (mp->m_binary && !tspec_is_scalar(rt))) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
 	} else if (mp->m_requires_arith) {
 		if (!tspec_is_arith(lt) ||
 		    (mp->m_binary && !tspec_is_arith(rt))) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
+	}
 	if (op == SHL || op == SHR || op == SHLASS || op == SHRASS) {
 		/*
 		 * For these operations we need the types before promotion
 		 * and balancing.
 		 */
 		for (tn=ln; tn->tn_op==CVT && !tn->tn_cast; tn=tn->tn_left)
 			continue;
 		olt = tn->tn_type->t_tspec;
 		for (tn=rn; tn->tn_op==CVT && !tn->tn_cast; tn=tn->tn_left)
 			continue;
 		ort = tn->tn_type->t_tspec;
+	}
 	switch (op) {
 	case POINT:
 		/*
 		 * Most errors required by ANSI C are reported in
 		 * struct_or_union_member().
 		 * Here we only must check for totally wrong things.
 		 */
 		if (lt == FUNC || lt == VOID || ltp->t_bitfield ||
 		    ((lt != STRUCT && lt != UNION) && !ln->tn_lvalue)) {
 			/* Without tflag we got already an error */
 			if (tflag)
 				/* unacceptable operand of '%s' */
 				error(111, mp->m_name);
 			return 0;
+		}
 		/* Now we have an object we can create a pointer to */
 		break;
 	case ARROW:
 		if (lt != PTR && !(tflag && tspec_is_int(lt))) {
 			/* Without tflag we got already an error */
 			if (tflag)
 				/* unacceptable operand of '%s' */
 				error(111, mp->m_name);
 			return 0;
+		}
 		break;
 	case INCAFT:
 	case DECAFT:
 	case INCBEF:
 	case DECBEF:
 		/* operands have scalar types (checked above) */
 		if (!ln->tn_lvalue) {
 			if (ln->tn_op == CVT && ln->tn_cast &&
 			    ln->tn_left->tn_op == LOAD) {
 				if (ln->tn_type->t_tspec == PTR)
 					break;
 				/* a cast does not yield an lvalue */
 				error(163);
+			}
 			/* %soperand of '%s' must be lvalue */
 			error(114, "", mp->m_name);
 			return 0;
 		} else if (ltp->t_const) {
 			if (!tflag)
 				/* %soperand of '%s' must be modifiable ... */
 				warning(115, "", mp->m_name);
+		}
 		break;
 	case AMPER:
 		if (lt == ARRAY || lt == FUNC) {
 			/* ok, a warning comes later (in build_ampersand()) */
 		} else if (!ln->tn_lvalue) {
 			if (ln->tn_op == CVT && ln->tn_cast &&
 			    ln->tn_left->tn_op == LOAD) {
 				if (ln->tn_type->t_tspec == PTR)
 					break;
 				/* a cast does not yield an lvalue */
 				error(163);
+			}
 			/* %soperand of '%s' must be lvalue */
 			error(114, "", mp->m_name);
 			return 0;
 		} else if (tspec_is_scalar(lt)) {
 			if (ltp->t_bitfield) {
 				/* cannot take address of bit-field */
 				error(112);
 				return 0;
+			}
 		} else if (lt != STRUCT && lt != UNION) {
 			/* unacceptable operand of '%s' */
 			error(111, mp->m_name);
 			return 0;
+		}
 		if (ln->tn_op == NAME && ln->tn_sym->s_reg) {
 			/* cannot take address of register %s */
 			error(113, ln->tn_sym->s_name);
 			return 0;
+		}
 		break;
 	case STAR:
 		/* until now there were no type checks for this operator */
 		if (lt != PTR) {
 			/* cannot dereference non-pointer type */
 			error(96);
 			return 0;
+		}
 		break;
 	case PLUS:
 		/* operands have scalar types (checked above) */
 		if ((lt == PTR && !tspec_is_int(rt)) ||
 		    (rt == PTR && !tspec_is_int(lt))) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
 		break;
 	case MINUS:
 		/* operands have scalar types (checked above) */
 		if (lt == PTR && (!tspec_is_int(rt) && rt != PTR)) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
 		} else if (rt == PTR && lt != PTR) {
 			warn_incompatible_types(op, lt, rt);
 			return 0;
+		}
 		if (lt == PTR && rt == PTR) {
 			if (!eqtype(lstp, rstp, 1, 0, NULL)) {
 				/* illegal pointer subtraction */
 				error(116);
+			}
+		}
 		break;
 	case SHR:
 		/* operands have integer types (checked above) */
 		if (pflag && !tspec_is_uint(lt)) {
 			/*
 			 * The left operand is signed. This means that
 			 * the operation is (possibly) nonportable.
 			 */
 			if (ln->tn_op != CON) {
 				/* bitop. on signed value poss. nonportable */
 				warning(117);
 			} else if (ln->tn_val->v_quad < 0) {
 				/* bitop. on signed value nonportable */
 				warning(120);
+			}
 		} else if (!tflag && !sflag &&
 		    !tspec_is_uint(olt) && tspec_is_uint(ort)) {
 			/*
 			 * The left operand would become unsigned in
 			 * traditional C.
 			 */
 			if (hflag &&
 			    (ln->tn_op != CON || ln->tn_val->v_quad < 0)) {
 				/* semantics of '%s' change in ANSI C; ... */
 				warning(118, mp->m_name);
+			}
 		} else if (!tflag && !sflag &&
 		    !tspec_is_uint(olt) && !tspec_is_uint(ort) &&
 			   psize(lt) < psize(rt)) {
 			/*
 			 * In traditional C the left operand would be extended,
 			 * possibly with 1, and then shifted.
 			 */
 			if (hflag &&
 			    (ln->tn_op != CON || ln->tn_val->v_quad < 0)) {
 				/* semantics of '%s' change in ANSI C; ... */
 				warning(118, mp->m_name);
+			}
+		}
 		goto shift;
 	case SHL:
 		/*
 		 * ANSI C does not perform balancing for shift operations,
 		 * but traditional C does. If the width of the right operand
 		 * is greater than the width of the left operand, than in
 		 * traditional C the left operand would be extended to the
 		 * width of the right operand. For SHL this may result in
 		 * different results.
 		 */
 		if (psize(lt) < psize(rt)) {
 			/*
 			 * XXX If both operands are constant, make sure
 			 * that there is really a difference between
 			 * ANSI C and traditional C.
 			 */
 			if (hflag)
 				/* semantics of '%s' change in ANSI C; ... */
 				warning(118, mp->m_name);
+		}
 	shift:
 		if (rn->tn_op == CON) {
 			if (!tspec_is_uint(rt) && rn->tn_val->v_quad < 0) {
 				/* negative shift */
 				warning(121);
 			} else if ((uint64_t)rn->tn_val->v_quad == (uint64_t)size(lt)) {
 				/* shift equal to size of object */
 				warning(267);
 			} else if ((uint64_t)rn->tn_val->v_quad > (uint64_t)size(lt)) {
 				/* shift greater than size of object */
 				warning(122);
+			}
+		}
 		break;
 	case EQ:
 	case NE:
 		/*
 		 * Accept some things which are allowed with EQ and NE,
 		 * but not with ordered comparisons.
 		 */
 		if (lt == PTR && ((rt == PTR && rst == VOID) ||
 				  tspec_is_int(rt))) {
 			if (rn->tn_op == CON && rn->tn_val->v_quad == 0)
 				break;
+		}
 		if (rt == PTR && ((lt == PTR && lst == VOID) ||
 				  tspec_is_int(lt))) {
 			if (ln->tn_op == CON && ln->tn_val->v_quad == 0)
 				break;
+		}
 		/* FALLTHROUGH */
 	case LT:
 	case GT:
 	case LE:
 	case GE:
 		if ((lt == PTR || rt == PTR) && lt != rt) {
 			if (tspec_is_int(lt) || tspec_is_int(rt)) {
 				const char *lx = lt == PTR ?
 				    "pointer" : "integer";
 				const char *rx = rt == PTR ?
 				    "pointer" : "integer";
 				/* illegal combination of %s (%s) and ... */
 				warning(123, lx, type_name(ltp),
 				    rx, type_name(rtp), mp->m_name);
 			} else {
 				warn_incompatible_types(op, lt, rt);
 				return 0;
+			}
 		} else if (lt == PTR && rt == PTR) {
 			check_pointer_comparison(op, ln, rn);
+		}
 		break;
 	case QUEST:
 		if (!tspec_is_scalar(lt)) {
 			/* first operand must have scalar type, op ? : */
 			error(170);
 			return 0;
+		}
 		while (rn->tn_op == CVT)
 			rn = rn->tn_left;
 		lint_assert(rn->tn_op == COLON);
 		break;
 	case COLON:
 		if (tspec_is_arith(lt) && tspec_is_arith(rt))
 			break;
 		if (lt == STRUCT && rt == STRUCT && ltp->t_str == rtp->t_str)
 			break;
 		if (lt == UNION && rt == UNION && ltp->t_str == rtp->t_str)
 			break;
 		/* combination of any pointer and 0, 0L or (void *)0 is ok */
 		if (lt == PTR && ((rt == PTR && rst == VOID) ||
 				  tspec_is_int(rt))) {
 			if (rn->tn_op == CON && rn->tn_val->v_quad == 0)
 				break;
+		}
 		if (rt == PTR && ((lt == PTR && lst == VOID) ||
 				  tspec_is_int(lt))) {
 			if (ln->tn_op == CON && ln->tn_val->v_quad == 0)
 				break;
+		}
 		if ((lt == PTR && tspec_is_int(rt)) ||
 		    (tspec_is_int(lt) && rt == PTR)) {
 			const char *lx = lt == PTR ?  "pointer" : "integer";
 			const char *rx = rt == PTR ?  "pointer" : "integer";
 			/* illegal combination of %s (%s) and %s (%s), op %s */
 			warning(123, lx, type_name(ltp),
 			    rx, type_name(rtp), mp->m_name);
 			break;
+		}
 		if (lt == VOID || rt == VOID) {
 			if (lt != VOID || rt != VOID)
 				/* incompatible types in conditional */
 				warning(126);
 			break;
+		}
 		if (lt == PTR && rt == PTR && ((lst == VOID && rst == FUNC) ||
 					       (lst == FUNC && rst == VOID))) {
 			/* (void *)0 handled above */
 			if (sflag)
 				/* ANSI C forbids conv. of %s to %s, op %s */
 				warning(305, "function pointer", "'void *'",
 					mp->m_name);
 			break;
+		}
 		if (rt == PTR && lt == PTR) {
 			if (eqptrtype(lstp, rstp, 1))
 				break;
 			if (!eqtype(lstp, rstp, 1, 0, NULL))
 				warn_incompatible_pointers(mp, ltp, rtp);
 			break;
+		}
 		/* incompatible types in conditional */
 		error(126);
 		return 0;
 @@ -2976,1145 +2976,1189 @@ build_sizeof(type_t *tp)
 #else
 	st = UINT;
 #endif
 	return new_integer_constant_node(st, tsize(tp) / CHAR_BIT);
+}
 /*
  * Create a constant node for offsetof.
  */
 tnode_t *
 build_offsetof(type_t *tp, sym_t *sym)
+{
 	tspec_t	st;
 #if SIZEOF_IS_ULONG
 	st = ULONG;
 #else
 	st = UINT;
 #endif
 	tspec_t t = tp->t_tspec;
 	if (t != STRUCT && t != UNION)
 		/* unacceptable operand of '%s' */
 		error(111, "offsetof");
 	// XXX: wrong size, no checking for sym fixme
 	return new_integer_constant_node(st, tsize(tp) / CHAR_BIT);
+}
 int64_t
 tsize(type_t *tp)
+{
 	int	elem, elsz, flex;
 	elem = 1;
 	flex = 0;
 	while (tp->t_tspec == ARRAY) {
 		flex = 1;	/* allow c99 flex arrays [] [0] */
 		elem *= tp->t_dim;
 		tp = tp->t_subt;
+	}
 	if (elem == 0) {
 		if (!flex) {
 			/* cannot take size/alignment of incomplete type */
 			error(143);
 			elem = 1;
+		}
+	}
 	switch (tp->t_tspec) {
 	case FUNC:
 		/* cannot take size/alignment of function */
 		error(144);
 		elsz = 1;
 		break;
 	case STRUCT:
 	case UNION:
 		if (incompl(tp)) {
 			/* cannot take size/alignment of incomplete type */
 			error(143);
 			elsz = 1;
 		} else {
 			elsz = tp->t_str->size;
+		}
 		break;
 	case ENUM:
 		if (incompl(tp)) {
 			/* cannot take size/alignment of incomplete type */
 			warning(143);
+		}
 		/* FALLTHROUGH */
 	default:
 		if (tp->t_bitfield) {
 			/* cannot take size/alignment of bit-field */
 			error(145);
+		}
 		if (tp->t_tspec == VOID) {
 			/* cannot take size/alignment of void */
 			error(146);
 			elsz = 1;
 		} else {
 			elsz = size(tp->t_tspec);
 			lint_assert(elsz > 0);
+		}
 		break;
+	}
 	/* XXX: type conversion is too late */
 	return (int64_t)(elem * elsz);
+}
 /*
  */
 tnode_t *
 build_alignof(type_t *tp)
+{
 	tspec_t	st;
 	switch (tp->t_tspec) {
 	case ARRAY:
 		break;
 	case FUNC:
 		/* cannot take size/alignment of function */
 		error(144);
 		return 0;
 	case STRUCT:
 	case UNION:
 		if (incompl(tp)) {
 			/* cannot take size/alignment of incomplete type */
 			error(143);
 			return 0;
+		}
 		break;
 	case ENUM:
 		break;
 	default:
 		if (tp->t_bitfield) {
 			/* cannot take size/alignment of bit-field */
 			error(145);
 			return 0;
+		}
 		if (tp->t_tspec == VOID) {
 			/* cannot take size/alignment of void */
 			error(146);
 			return 0;
+		}
 		break;
+	}
 #if SIZEOF_IS_ULONG
 	st = ULONG;
 #else
 	st = UINT;
 #endif
 	return new_integer_constant_node(st, (int64_t)getbound(tp) / CHAR_BIT);
+}
 /*
  * Type casts.
  */
 tnode_t *
 cast(tnode_t *tn, type_t *tp)
+{
 	tspec_t	nt, ot;
 	if (tn == NULL)
 		return NULL;
 	tn = cconv(tn);
 	nt = tp->t_tspec;
 	ot = tn->tn_type->t_tspec;
 	if (nt == VOID) {
 		/*
 		 * XXX ANSI C requires scalar types or void (Plauger & Brodie).
 		 * But this seams really questionable.
 		 */
 	} else if (nt == UNION) {
 		sym_t *m;
 		str_t *str = tp->t_str;
 		if (!Sflag) {
 			/* union cast is a C9X feature */
 			error(328);
 			return NULL;
+		}
 		for (m = str->memb; m != NULL; m = m->s_next) {
 			if (sametype(m->s_type, tn->tn_type)) {
 				tn = getnode();
 				tn->tn_op = CVT;
 				tn->tn_type = tp;
 				tn->tn_cast = 1;
 				tn->tn_right = NULL;
 				return tn;
+			}
+		}
 		/* type '%s' is not a member of '%s' */
 		error(329, type_name(tn->tn_type), type_name(tp));
 		return NULL;
 	} else if (nt == STRUCT || nt == ARRAY || nt == FUNC) {
 		if (!Sflag || nt == ARRAY || nt == FUNC) {
 			/* invalid cast expression */
 			error(147);
 			return NULL;
+		}
 	} else if (ot == STRUCT || ot == UNION) {
 		/* invalid cast expression */
 		error(147);
 		return NULL;
 	} else if (ot == VOID) {
 		/* improper cast of void expression */
 		error(148);
 		return NULL;
 	} else if (tspec_is_int(nt) && tspec_is_scalar(ot)) {
 		/* ok */
 	} else if (tspec_is_float(nt) && tspec_is_arith(ot)) {
 		/* ok */
 	} else if (nt == PTR && tspec_is_int(ot)) {
 		/* ok */
 	} else if (nt == PTR && ot == PTR) {
 		if (!tp->t_subt->t_const && tn->tn_type->t_subt->t_const) {
 			if (hflag)
 				/* cast discards 'const' from ... */
 				warning(275);
+		}
 	} else {
 		/* invalid cast expression */
 		error(147);
 		return NULL;
+	}
 	tn = convert(CVT, 0, tp, tn);
 	tn->tn_cast = 1;
 	return tn;
+}
 /*
  * Create the node for a function argument.
  * All necessary conversions and type checks are done in
  * new_function_call_node because new_function_argument_node has no
  * information about expected argument types.
  */
 tnode_t *
 new_function_argument_node(tnode_t *args, tnode_t *arg)
+{
 	tnode_t	*ntn;
 	/*
 	 * If there was a serious error in the expression for the argument,
 	 * create a dummy argument so the positions of the remaining arguments
 	 * will not change.
 	 */
 	if (arg == NULL)
 		arg = new_integer_constant_node(INT, (int64_t)0);
 	ntn = new_tnode(PUSH, arg->tn_type, arg, args);
 	return ntn;
+}
 /*
  * Create the node for a function call. Also check types of
  * function arguments and insert conversions, if necessary.
  */
 tnode_t *
 new_function_call_node(tnode_t *func, tnode_t *args)
+{
 	tnode_t	*ntn;
 	op_t	fcop;
 	if (func == NULL)
 		return NULL;
 	if (func->tn_op == NAME && func->tn_type->t_tspec == FUNC) {
 		fcop = CALL;
 	} else {
 		fcop = ICALL;
+	}
 	/*
 	 * after cconv() func will always be a pointer to a function
 	 * if it is a valid function designator.
 	 */
 	func = cconv(func);
 	if (func->tn_type->t_tspec != PTR ||
 	    func->tn_type->t_subt->t_tspec != FUNC) {
 		/* illegal function (type %s) */
 		error(149, type_name(func->tn_type));
 		return NULL;
+	}
 	args = check_function_arguments(func->tn_type->t_subt, args);
 	ntn = new_tnode(fcop, func->tn_type->t_subt->t_subt, func, args);
 	return ntn;
+}
 /*
  * Check types of all function arguments and insert conversions,
  * if necessary.
  */
 static tnode_t *
 check_function_arguments(type_t *ftp, tnode_t *args)
+{
 	tnode_t	*arg;
 	sym_t	*asym;
 	tspec_t	at;
 	int	narg, npar, n, i;
 	/* get # of args in the prototype */
 	npar = 0;
 	for (asym = ftp->t_args; asym != NULL; asym = asym->s_next)
 		npar++;
 	/* get # of args in function call */
 	narg = 0;
 	for (arg = args; arg != NULL; arg = arg->tn_right)
 		narg++;
 	asym = ftp->t_args;
 	if (ftp->t_proto && npar != narg && !(ftp->t_vararg && npar < narg)) {
 		/* argument mismatch: %d arg%s passed, %d expected */
 		error(150, narg, narg > 1 ? "s" : "", npar);
 		asym = NULL;
+	}
 	for (n = 1; n <= narg; n++) {
 		/*
 		 * The rightmost argument is at the top of the argument
 		 * subtree.
 		 */
 		for (i = narg, arg = args; i > n; i--, arg = arg->tn_right)
 			continue;
 		/* some things which are always not allowed */
 		if ((at = arg->tn_left->tn_type->t_tspec) == VOID) {
 			/* void expressions may not be arguments, arg #%d */
 			error(151, n);
 			return NULL;
 		} else if ((at == STRUCT || at == UNION) &&
 			   incompl(arg->tn_left->tn_type)) {
 			/* argument cannot have unknown size, arg #%d */
 			error(152, n);
 			return NULL;
 		} else if (tspec_is_int(at) &&
 			   arg->tn_left->tn_type->t_isenum &&
 			   incompl(arg->tn_left->tn_type)) {
 			/* argument cannot have unknown size, arg #%d */
 			warning(152, n);
+		}
 		/* class conversions (arg in value context) */
 		arg->tn_left = cconv(arg->tn_left);
 		if (asym != NULL) {
 			arg->tn_left = check_prototype_argument(
 			    n, asym->s_type, arg->tn_left);
 		} else {
 			arg->tn_left = promote(NOOP, 1, arg->tn_left);
+		}
 		arg->tn_type = arg->tn_left->tn_type;
 		if (asym != NULL)
 			asym = asym->s_next;
+	}
 	return args;
+}
 /*
  * Compare the type of an argument with the corresponding type of a
  * prototype parameter. If it is a valid combination, but both types
  * are not the same, insert a conversion to convert the argument into
  * the type of the parameter.
  */
 static tnode_t *
 check_prototype_argument(
 	int	n,		/* pos of arg */
 	type_t	*tp,		/* expected type (from prototype) */
 	tnode_t	*tn)		/* argument */
+{
 	tnode_t	*ln;
 	int	dowarn;
 	ln = xcalloc(1, sizeof (tnode_t));
 	ln->tn_type = tduptyp(tp);
 	ln->tn_type->t_const = 0;
 	ln->tn_lvalue = 1;
 	if (typeok(FARG, n, ln, tn)) {
 		if (!eqtype(tp, tn->tn_type, 1, 0, (dowarn = 0, &dowarn)) || dowarn)
 			tn = convert(FARG, n, tp, tn);
+	}
 	free(ln);
 	return tn;
+}
 /*
  * Return the value of an integral constant expression.
  * If the expression is not constant or its type is not an integer
  * type, an error message is printed.
  */
 val_t *
 constant(tnode_t *tn, int required)
+{
 	val_t	*v;
 	if (tn != NULL)
 		tn = cconv(tn);
 	if (tn != NULL)
 		tn = promote(NOOP, 0, tn);
 	v = xcalloc(1, sizeof (val_t));
 	if (tn == NULL) {
 		lint_assert(nerr != 0);
 		v->v_tspec = INT;
 		v->v_quad = 1;
 		return v;
+	}
 	v->v_tspec = tn->tn_type->t_tspec;
 	if (tn->tn_op == CON) {
 		lint_assert(tn->tn_type->t_tspec == tn->tn_val->v_tspec);
 		if (tspec_is_int(tn->tn_val->v_tspec)) {
 			v->v_ansiu = tn->tn_val->v_ansiu;
 			v->v_quad = tn->tn_val->v_quad;
 			return v;
+		}
 		v->v_quad = tn->tn_val->v_ldbl;
 	} else {
 		v->v_quad = 1;
+	}
 	if (required)
 		/* integral constant expression expected */
 		error(55);
 	else
 		/* variable array dimension is a C99/GCC extension */
 		c99ism(318);
 	if (!tspec_is_int(v->v_tspec))
 		v->v_tspec = INT;
 	return v;
+}
 /*
  * Perform some tests on expressions which can't be done in build() and
  * functions called by build(). These tests must be done here because
  * we need some information about the context in which the operations
  * are performed.
  * After all tests are performed, expr() frees the memory which is used
  * for the expression.
  */
 void
 expr(tnode_t *tn, int vctx, int tctx, int dofreeblk)
+{
 	lint_assert(tn != NULL || nerr != 0);
 	if (tn == NULL) {
 		tfreeblk();
 		return;
+	}
 	/* expr() is also called in global initialisations */
 	if (dcs->d_ctx != EXTERN)
 		check_statement_reachable();
 	check_expr_misc(tn, vctx, tctx, !tctx, 0, 0, 0);
 	if (tn->tn_op == ASSIGN) {
 		if (hflag && tctx)
 			/* assignment in conditional context */
 			warning(159);
 	} else if (tn->tn_op == CON) {
 		if (hflag && tctx && !constcond_flag)
 			/* constant in conditional context */
 			warning(161);
+	}
 	if (!modtab[tn->tn_op].m_sideeff) {
 		/*
 		 * for left operands of COMMA this warning is already
 		 * printed
 		 */
 		if (tn->tn_op != COMMA && !vctx && !tctx)
 			check_null_effect(tn);
+	}
 	if (dflag)
 		display_expression(tn, 0);
 	/* free the tree memory */
 	if (dofreeblk)
 		tfreeblk();
+}
 static void
 check_null_effect(tnode_t *tn)
+{
 	if (!hflag)
 		return;
 	while (!modtab[tn->tn_op].m_sideeff) {
 		if (tn->tn_op == CVT && tn->tn_type->t_tspec == VOID) {
 			tn = tn->tn_left;
 		} else if (tn->tn_op == LOGAND || tn->tn_op == LOGOR) {
 			/*
 			 * && and || have a side effect if the right operand
 			 * has a side effect.
 			 */
 			tn = tn->tn_right;
 		} else if (tn->tn_op == QUEST) {
 			/*
 			 * ? has a side effect if at least one of its right
 			 * operands has a side effect
 			 */
 			tn = tn->tn_right;
 		} else if (tn->tn_op == COLON || tn->tn_op == COMMA) {
 			/*
 			 * : has a side effect if at least one of its operands
 			 * has a side effect
 			 */
 			if (modtab[tn->tn_left->tn_op].m_sideeff) {
 				tn = tn->tn_left;
 			} else if (modtab[tn->tn_right->tn_op].m_sideeff) {
 				tn = tn->tn_right;
 			} else {
 				break;
+			}
 		} else {
 			break;
+		}
+	}
 	if (!modtab[tn->tn_op].m_sideeff)
 		/* expression has null effect */
 		warning(129);
+}
 /*
  * Dump an expression to stdout
  * only used for debugging
  */
 static void
 display_expression(tnode_t *tn, int offs)
+{
 	uint64_t uq;
 	if (tn == NULL) {
 		(void)printf("%*s%s\n", offs, "", "NULL");
 		return;
+	}
 	(void)printf("%*sop %s  ", offs, "", modtab[tn->tn_op].m_name);
 	if (tn->tn_op == NAME) {
 		(void)printf("%s: %s ",
 		    tn->tn_sym->s_name,
 		    storage_class_name(tn->tn_sym->s_scl));
 	} else if (tn->tn_op == CON && tspec_is_float(tn->tn_type->t_tspec)) {
 		(void)printf("%#g ", (double)tn->tn_val->v_ldbl);
 	} else if (tn->tn_op == CON && tspec_is_int(tn->tn_type->t_tspec)) {
 		uq = tn->tn_val->v_quad;
 		(void)printf("0x %08lx %08lx ",
 		    (long)(uq >> 32) & 0xffffffffl,
 		    (long)uq & 0xffffffffl);
 	} else if (tn->tn_op == CON) {
 		lint_assert(tn->tn_type->t_tspec == PTR);
 		(void)printf("0x%0*lx ", (int)(sizeof (void *) * CHAR_BIT / 4),
 			     (u_long)tn->tn_val->v_quad);
 	} else if (tn->tn_op == STRING) {
 		if (tn->tn_string->st_tspec == CHAR) {
 			(void)printf("\"%s\"", tn->tn_string->st_cp);
 		} else {
 			char	*s;
 			size_t	n;
 			n = MB_CUR_MAX * (tn->tn_string->st_len + 1);
 			s = xmalloc(n);
 			(void)wcstombs(s, tn->tn_string->st_wcp, n);
 			(void)printf("L\"%s\"", s);
 			free(s);
+		}
 		(void)printf(" ");
 	} else if (tn->tn_op == FSEL) {
 		(void)printf("o=%d, l=%d ", tn->tn_type->t_foffs,
 			     tn->tn_type->t_flen);
+	}
 	(void)printf("%s\n", ttos(tn->tn_type));
 	if (tn->tn_op == NAME || tn->tn_op == CON || tn->tn_op == STRING)
 		return;
 	display_expression(tn->tn_left, offs + 2);
 	if (modtab[tn->tn_op].m_binary ||
 	    (tn->tn_op == PUSH && tn->tn_right != NULL)) {
 		display_expression(tn->tn_right, offs + 2);
+	}
+}
 /*
  * Called by expr() to recursively perform some tests.
  */
 /* ARGSUSED */
 void
 check_expr_misc(tnode_t *tn, int vctx, int tctx, int eqwarn, int fcall, int rvdisc,
 	int szof)
+{
 	tnode_t	*ln, *rn;
 	mod_t	*mp;
 	int	nrvdisc, cvctx, ctctx;
 	op_t	op;
 	scl_t	sc;
 	dinfo_t	*di;
 	if (tn == NULL)
 		return;
 	ln = tn->tn_left;
 	rn = tn->tn_right;
 	mp = &modtab[op = tn->tn_op];
 	switch (op) {
 	case AMPER:
 		if (ln->tn_op == NAME && (reached || rchflg)) {
 			if (!szof)
 				mark_as_set(ln->tn_sym);
 			mark_as_used(ln->tn_sym, fcall, szof);
+		}
 		if (ln->tn_op == STAR && ln->tn_left->tn_op == PLUS)
 			/* check the range of array indices */
 			check_array_index(ln->tn_left, 1);
 		break;
 	case LOAD:
 		if (ln->tn_op == STAR && ln->tn_left->tn_op == PLUS)
 			/* check the range of array indices */
 			check_array_index(ln->tn_left, 0);
 		/* FALLTHROUGH */
 	case PUSH:
 	case INCBEF:
 	case DECBEF:
 	case INCAFT:
 	case DECAFT:
 	case ADDASS:
 	case SUBASS:
 	case MULASS:
 	case DIVASS:
 	case MODASS:
 	case ANDASS:
 	case ORASS:
 	case XORASS:
 	case SHLASS:
 	case SHRASS:
 	case REAL:
 	case IMAG:
 		if (ln->tn_op == NAME && (reached || rchflg)) {
 			sc = ln->tn_sym->s_scl;
 			/*
 			 * Look if there was a asm statement in one of the
 			 * compound statements we are in. If not, we don't
 			 * print a warning.
 			 */
 			for (di = dcs; di != NULL; di = di->d_next) {
 				if (di->d_asm)
 					break;
+			}
 			if (sc != EXTERN && sc != STATIC &&
 			    !ln->tn_sym->s_set && !szof && di == NULL) {
 				/* %s may be used before set */
 				warning(158, ln->tn_sym->s_name);
 				mark_as_set(ln->tn_sym);
+			}
 			mark_as_used(ln->tn_sym, 0, 0);
+		}
 		break;
 	case ASSIGN:
 		if (ln->tn_op == NAME && !szof && (reached || rchflg)) {
 			mark_as_set(ln->tn_sym);
 			if (ln->tn_sym->s_scl == EXTERN)
 				outusg(ln->tn_sym);
+		}
 		if (ln->tn_op == STAR && ln->tn_left->tn_op == PLUS)
 			/* check the range of array indices */
 			check_array_index(ln->tn_left, 0);
 		break;
 	case CALL:
 		if (ln->tn_op != AMPER || ln->tn_left->tn_op != NAME)
 			LERROR("check_expr_misc(op=%s != %s || %s != %s)",
 			    getopname(ln->tn_op), getopname(AMPER),
 			    getopname(ln->tn_left->tn_op), getopname(NAME));
 		if (!szof)
 			outcall(tn, vctx || tctx, rvdisc);
 		break;
 	case EQ:
 		if (hflag && eqwarn)
 			/* operator '==' found where '=' was expected */
 			warning(160);
 		break;
 	case CON:
 	case NAME:
 	case STRING:
 		return;
 		/* LINTED206: (enumeration values not handled in switch) */
 	case OR:
 	case XOR:
 	case NE:
 	case GE:
 	case GT:
 	case LE:
 	case LT:
 	case SHR:
 	case SHL:
 	case MINUS:
 	case PLUS:
 	case MOD:
 	case DIV:
 	case MULT:
 	case STAR:
 	case UMINUS:
 	case UPLUS:
 	case DEC:
 	case INC:
 	case COMPL:
 	case NOT:
 	case POINT:
 	case ARROW:
 	case NOOP:
 	case AND:
 	case FARG:
 	case CASE:
 	case INIT:
 	case RETURN:
 	case ICALL:
 	case CVT:
 	case COMMA:
 	case FSEL:
 	case COLON:
 	case QUEST:
 	case LOGOR:
 	case LOGAND:
 		break;
+	}
 	cvctx = mp->m_vctx;
 	ctctx = mp->m_tctx;
 	/*
 	 * values of operands of ':' are not used if the type of at least
 	 * one of the operands (for gcc compatibility) is void
 	 * XXX test/value context of QUEST should probably be used as
 	 * context for both operands of COLON
 	 */
 	if (op == COLON && tn->tn_type->t_tspec == VOID)
 		cvctx = ctctx = 0;
 	nrvdisc = op == CVT && tn->tn_type->t_tspec == VOID;
 	check_expr_misc(ln, cvctx, ctctx, mp->m_eqwarn, op == CALL, nrvdisc, szof);
 	switch (op) {
 	case PUSH:
 		if (rn != NULL)
 			check_expr_misc(rn, 0, 0, mp->m_eqwarn, 0, 0, szof);
 		break;
 	case LOGAND:
 	case LOGOR:
 		check_expr_misc(rn, 0, 1, mp->m_eqwarn, 0, 0, szof);
 		break;
 	case COLON:
 		check_expr_misc(rn, cvctx, ctctx, mp->m_eqwarn, 0, 0, szof);
 		break;
 	case COMMA:
 		check_expr_misc(rn, vctx, tctx, mp->m_eqwarn, 0, 0, szof);
 		break;
 	default:
 		if (mp->m_binary)
 			check_expr_misc(rn, 1, 0, mp->m_eqwarn, 0, 0, szof);
 		break;
+	}
+}
 /*
  * Checks the range of array indices, if possible.
  * amper is set if only the address of the element is used. This
  * means that the index is allowed to refer to the first element
  * after the array.
  */
 static void
 check_array_index(tnode_t *tn, int amper)
+{
 	int	dim;
 	tnode_t	*ln, *rn;
 	int	elsz;
 	int64_t	con;
 	ln = tn->tn_left;
 	rn = tn->tn_right;
 	/* We can only check constant indices. */
 	if (rn->tn_op != CON)
 		return;
 	/* Return if the left node does not stem from an array. */
 	if (ln->tn_op != AMPER)
 		return;
 	if (ln->tn_left->tn_op != STRING && ln->tn_left->tn_op != NAME)
 		return;
 	if (ln->tn_left->tn_type->t_tspec != ARRAY)
 		return;
 	/*
 	 * For incomplete array types, we can print a warning only if
 	 * the index is negative.
 	 */
 	if (incompl(ln->tn_left->tn_type) && rn->tn_val->v_quad >= 0)
 		return;
 	/* Get the size of one array element */
 	if ((elsz = length(ln->tn_type->t_subt, NULL)) == 0)
 		return;
 	elsz /= CHAR_BIT;
 	/* Change the unit of the index from bytes to element size. */
 	if (tspec_is_uint(rn->tn_type->t_tspec)) {
 		con = (uint64_t)rn->tn_val->v_quad / elsz;
 	} else {
 		con = rn->tn_val->v_quad / elsz;
+	}
 	dim = ln->tn_left->tn_type->t_dim + (amper ? 1 : 0);
 	if (!tspec_is_uint(rn->tn_type->t_tspec) && con < 0) {
 		/* array subscript cannot be negative: %ld */
 		warning(167, (long)con);
 	} else if (dim > 0 && (uint64_t)con >= (uint64_t)dim) {
 		/* array subscript cannot be > %d: %ld */
 		warning(168, dim - 1, (long)con);
+	}
+}
 /*
  * Check for ordered comparisons of unsigned values with 0.
  */
 static void
 check_integer_comparison(op_t op, tnode_t *ln, tnode_t *rn)
+{
 	tspec_t	lt, rt;
 	mod_t	*mp;
 	lt = ln->tn_type->t_tspec;
 	rt = rn->tn_type->t_tspec;
 	mp = &modtab[op];
 	if (ln->tn_op != CON && rn->tn_op != CON)
 		return;
 	if (!tspec_is_int(lt) || !tspec_is_int(rt))
 		return;
 	if ((hflag || pflag) && lt == CHAR && rn->tn_op == CON &&
 	    (rn->tn_val->v_quad < 0 ||
 	     rn->tn_val->v_quad > (int)~(~0U << (CHAR_BIT - 1)))) {
 		/* nonportable character comparison, op %s */
 		warning(230, mp->m_name);
 		return;
+	}
 	if ((hflag || pflag) && rt == CHAR && ln->tn_op == CON &&
 	    (ln->tn_val->v_quad < 0 ||
 	     ln->tn_val->v_quad > (int)~(~0U << (CHAR_BIT - 1)))) {
 		/* nonportable character comparison, op %s */
 		warning(230, mp->m_name);
 		return;
+	}
 	if (tspec_is_uint(lt) && !tspec_is_uint(rt) &&
 	    rn->tn_op == CON && rn->tn_val->v_quad <= 0) {
 		if (rn->tn_val->v_quad < 0) {
 			/* comparison of %s with %s, op %s */
 			warning(162, type_name(ln->tn_type),
 			    "negative constant", mp->m_name);
 		} else if (op == LT || op == GE || (hflag && op == LE)) {
 			/* comparison of %s with %s, op %s */
 			warning(162, type_name(ln->tn_type), "0", mp->m_name);
+		}
 		return;
+	}
 	if (tspec_is_uint(rt) && !tspec_is_uint(lt) &&
 	    ln->tn_op == CON && ln->tn_val->v_quad <= 0) {
 		if (ln->tn_val->v_quad < 0) {
 			/* comparison of %s with %s, op %s */
 			warning(162, "negative constant",
 			    type_name(rn->tn_type), mp->m_name);
 		} else if (op == GT || op == LE || (hflag && op == GE)) {
 			/* comparison of %s with %s, op %s */
 			warning(162, "0", type_name(rn->tn_type), mp->m_name);
+		}
 		return;
+	}
+}
 /*
  * Takes an expression an returns 0 if this expression can be used
  * for static initialisation, otherwise -1.
+ *
  * Constant initialisation expressions must be constant or an address
  * of a static object with an optional offset. In the first case,
  * the result is returned in *offsp. In the second case, the static
  * object is returned in *symp and the offset in *offsp.
+ *
  * The expression can consist of PLUS, MINUS, AMPER, NAME, STRING and
  * CON. Type conversions are allowed if they do not change binary
  * representation (including width).
  */
 int
 conaddr(tnode_t *tn, sym_t **symp, ptrdiff_t *offsp)
+{
 	sym_t	*sym;
 	ptrdiff_t offs1, offs2;
 	tspec_t	t, ot;
 	switch (tn->tn_op) {
 	case MINUS:
 		if (tn->tn_right->tn_op == CVT)
 			return conaddr(tn->tn_right, symp, offsp);
 		else if (tn->tn_right->tn_op != CON)
 			return -1;
 		/* FALLTHROUGH */
 	case PLUS:
 		offs1 = offs2 = 0;
 		if (tn->tn_left->tn_op == CON) {
 			offs1 = (ptrdiff_t)tn->tn_left->tn_val->v_quad;
 			if (conaddr(tn->tn_right, &sym, &offs2) == -1)
 				return -1;
 		} else if (tn->tn_right->tn_op == CON) {
 			offs2 = (ptrdiff_t)tn->tn_right->tn_val->v_quad;
 			if (tn->tn_op == MINUS)
 				offs2 = -offs2;
 			if (conaddr(tn->tn_left, &sym, &offs1) == -1)
 				return -1;
 		} else {
 			return -1;
+		}
 		*symp = sym;
 		*offsp = offs1 + offs2;
 		break;
 	case AMPER:
 		if (tn->tn_left->tn_op == NAME) {
 			*symp = tn->tn_left->tn_sym;
 			*offsp = 0;
 		} else if (tn->tn_left->tn_op == STRING) {
 			/*
 			 * If this would be the front end of a compiler we
 			 * would return a label instead of 0.
 			 */
 			*offsp = 0;
+		}
 		break;
 	case CVT:
 		t = tn->tn_type->t_tspec;
 		ot = tn->tn_left->tn_type->t_tspec;
 		if ((!tspec_is_int(t) && t != PTR) ||
 		    (!tspec_is_int(ot) && ot != PTR)) {
 			return -1;
+		}
 #ifdef notdef
 		/*
 		 * consider:
 		 *	struct foo {
 		 *		unsigned char a;
 		 *	} f = {
 		 *		(u_char)(u_long)(&(((struct foo *)0)->a))
 		 *	};
 		 * since psize(u_long) != psize(u_char) this fails.
 		 */
 		else if (psize(t) != psize(ot))
 			return -1;
 #endif
 		if (conaddr(tn->tn_left, symp, offsp) == -1)
 			return -1;
 		break;
 	default:
 		return -1;
+	}
 	return 0;
+}
 /*
  * Concatenate two string constants.
  */
 strg_t *
 cat_strings(strg_t *strg1, strg_t *strg2)
+{
 	size_t	len1, len2, len;
 	if (strg1->st_tspec != strg2->st_tspec) {
 		/* cannot concatenate wide and regular string literals */
 		error(292);
 		return strg1;
+	}
 	len1 = strg1->st_len;
 	len2 = strg2->st_len + 1;	/* + NUL */
 	len = len1 + len2;
 #define COPY(F) \
     do { \
 	strg1->F = xrealloc(strg1->F, len * sizeof(*strg1->F)); \
 	(void)memcpy(strg1->F + len1, strg2->F, len2 * sizeof(*strg1->F)); \
 	free(strg2->F); \
     } while (/*CONSTCOND*/0)
 	if (strg1->st_tspec == CHAR)
 		COPY(st_cp);
 	else
 		COPY(st_wcp);
 	strg1->st_len = len - 1; /* - NUL */
 	free(strg2);
 	return strg1;
+}
 #ifdef DEBUG
 static void
 dprint_node(const tnode_t *tn)
+{
 	static int indent = 0;
 	op_t op = tn->tn_op;
 	if (tn == NULL) {
 		printf("%*s" "null\n", indent, "");
 		return;
+	}
 	printf("%*s%s: %s%s%s",
 	    indent, "",
 	    op == CVT && !tn->tn_cast ? "convert" :
 	    op == NAME ? "name" : getopname(op),
 	    type_name(tn->tn_type), tn->tn_lvalue ? " lvalue" : "",
 	    tn->tn_parenthesized ? " ()" : "");
 	indent += 2;
 	if (op == NAME)
 		printf(" %s\n", tn->tn_sym->s_name);
 	else if (op == CON)
 		printf(" value=?\n");
 	else if (op == STRING)
 		printf(" length=%zu\n", tn->tn_string->st_len);
 	else {
 		printf("\n");
 		dprint_node(tn->tn_left);
 		if (modtab[op].m_binary)
 			dprint_node(tn->tn_right);
+	}
 	indent -= 2;
+}
 #else
 /*ARGSUSED*/
 static void
 dprint_node(const tnode_t *tn)
+{
+}
 #endif
 /*
  * Print a warning if the given node has operands which should be
  * parenthesized.
+ *
  * XXX Does not work if an operand is a constant expression. Constant
  * expressions are already folded.
  */
 static void
 check_precedence_confusion(tnode_t *tn)
+{
 	tnode_t	*ln, *rn;
 	op_t	lop, rop = NOOP;
 	int	lparn, rparn = 0;
 	mod_t	*mp;
 	int	dowarn;
 	if (!hflag)
 		return;
 	mp = &modtab[tn->tn_op];
 	lparn = 0;
 	for (ln = tn->tn_left; ln->tn_op == CVT; ln = ln->tn_left)
 		lparn |= ln->tn_parenthesized;
 	lparn |= ln->tn_parenthesized;
 	lop = ln->tn_op;
 	dprint_node(tn);
 	if (mp->m_binary) {
 		rparn = 0;
 		/*
 		 * FIXME: There is a typo "tn->tn_op == CVT", which should
 		 * rather be "rn->tn_op".  Since tn must be a binary operator,
 		 * it can never be CVT.
+		 *
 		 * Before fixing this though, there should be a unit test
 		 * that demonstrates an actual change in behavior when this
 		 * bug gets fixed.
 		 */
 		for (rn = tn->tn_right; tn->tn_op == CVT; rn = rn->tn_left)
 			rparn |= rn->tn_parenthesized;
 		rparn |= rn->tn_parenthesized;
 		rop = rn->tn_op;
+	}
 	dowarn = 0;
 	switch (tn->tn_op) {
 	case SHL:
 	case SHR:
 		if (!lparn && (lop == PLUS || lop == MINUS)) {
 			dowarn = 1;
 		} else if (!rparn && (rop == PLUS || rop == MINUS)) {
 			dowarn = 1;
+		}
 		break;
 	case LOGOR:
 		if (!lparn && lop == LOGAND) {
 			dowarn = 1;
 		} else if (!rparn && rop == LOGAND) {
 			dowarn = 1;
+		}
 		break;
 	case AND:
 	case XOR:
 	case OR:
 		if (!lparn && lop != tn->tn_op) {
 			if (lop == PLUS || lop == MINUS) {
 				dowarn = 1;
 			} else if (lop == AND || lop == XOR) {
 				dowarn = 1;
+			}
+		}
 		if (!dowarn && !rparn && rop != tn->tn_op) {
 			if (rop == PLUS || rop == MINUS) {
 				dowarn = 1;
 			} else if (rop == AND || rop == XOR) {
 				dowarn = 1;
+			}
+		}
 		break;
 		/* LINTED206: (enumeration values not handled in switch) */
 	case DECAFT:
 	case XORASS:
 	case SHLASS:
 	case NOOP:
 	case ARROW:
 	case ORASS:
 	case POINT:
 	case NAME:
 	case NOT:
 	case COMPL:
 	case CON:
 	case INC:
 	case STRING:
 	case DEC:
 	case INCBEF:
 	case DECBEF:
 	case INCAFT:
 	case FSEL:
 	case CALL:
 	case COMMA:
 	case CVT:
 	case ICALL:
 	case LOAD:
 	case PUSH:
 	case RETURN:
 	case INIT:
 	case CASE:
 	case FARG:
 	case SUBASS:
 	case ADDASS:
 	case MODASS:
 	case DIVASS:
 	case MULASS:
 	case ASSIGN:
 	case COLON:
 	case QUEST:
 	case LOGAND:
 	case NE:
 	case EQ:
 	case GE:
 	case GT:
 	case LE:
 	case LT:
 	case MINUS:
 	case PLUS:
 	case MOD:
 	case DIV:
 	case MULT:
 	case AMPER:
 	case STAR:
 	case UMINUS:
 	case SHRASS:
 	case UPLUS:
 	case ANDASS:
 	case REAL:
 	case IMAG:
 		break;
+	}
 	if (dowarn) {
 		/* precedence confusion possible: parenthesize! */
 		warning(169);
+	}
+}