 @@ -1,14 +1,14 @@
-/*	$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.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.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);
 @@ -3962,26 +3962,68 @@ cat_strings(strg_t *strg1, strg_t *strg2
     } 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;
 @@ -3989,26 +4031,28 @@ check_precedence_confusion(tnode_t *tn)
 	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;