 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_169.c,v 1.2 2021/01/04 15:52:51 rillig Exp $	*/
+/*	$NetBSD: msg_169.c,v 1.3 2021/01/04 22:41:56 rillig Exp $	*/
 # 3 "msg_169.c"
 // Test for message: precedence confusion possible: parenthesize! [169]
 /* lint1-flags: -g -h -S -w */
 typedef _Bool bool;
 void
 confusing_shift_arith(unsigned a, unsigned b, unsigned c, unsigned char ch)
+{
 	unsigned con, okl, okr;
 @@ -136,15 +136,16 @@ cast_expressions(char a, char b, char c)
 	con = a | (unsigned)(b & c);
 	con = (unsigned)(a | b) & (unsigned)c;
 	con = (unsigned)(a | b) & c;
+}
 void
 expected_precedence(int a, int b, int c)
+{
 	int ok;
 	ok = a + b * c;
+}
-// TODO: add a test with unsigned long instead of unsigned, to demonstrate
+// TODO: add a test with unsigned long instead of unsigned, trying to
-//  that the typo in
+//  demonstrate that the typo in check_precedence_confusion actually has an
 //  effect.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.128 2021/01/04 22:33:47 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.129 2021/01/04 22:41:56 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.128 2021/01/04 22:33:47 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.129 2021/01/04 22:41:56 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);
 @@ -4006,26 +4006,39 @@ check_precedence_confusion(tnode_t *tn)
 	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.
+		 *
 		 * Right now, the condition is always false.  To make it true
 		 * after fixing the typo, the right-hand operand must be an
 		 * explicit cast or an implicit conversion that is
 		 * parenthesized.  For the right-hand operand itself, this
 		 * would already be done using the line below the loop.
+		 *
 		 * To make a difference, the right-hand operand must not be
 		 * parenthesized, but its indirect cast or conversion must be.
+		 *
 		 * An implicit conversion is never parenthesized.  Therefore
 		 * this must be a cast that is later converted, to build a
 		 * chain.
 		 */
 		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)) {