Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint: remove redundant braces in is_confusing_precedence

Browse Source 
This nicely aligns the different branches, in which "l" and "r" are
swapped.

No functional change.
This commit is contained in:
rillig 2021-01-10 00:12:50 +00:00
parent fe68124a52
commit bfe7d5e162
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
usr.bin/xlint/lint1/tree.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tree.c,v 1.144 2021/01/10 00:05:46 rillig Exp $ */
/* $NetBSD: tree.c,v 1.145 2021/01/10 00:12:50 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
__RCSID("$NetBSD: tree.c,v 1.144 2021/01/10 00:05:46 rillig Exp $");
__RCSID("$NetBSD: tree.c,v 1.145 2021/01/10 00:12:50 rillig Exp $");
#endif
#include <float.h>
@ -4082,37 +4082,33 @@ is_confusing_precedence(op_t op, op_t lop, bool lparen, op_t rop, bool rparen)
{
if (op == SHL || op == SHR) {
if (!lparen && (lop == PLUS || lop == MINUS)) {
if (!lparen && (lop == PLUS || lop == MINUS))
return true;
} else if (!rparen && (rop == PLUS || rop == MINUS)) {
if (!rparen && (rop == PLUS || rop == MINUS))
return true;
}
return false;
}
if (op == LOGOR) {
if (!lparen && lop == LOGAND) {
if (!lparen && lop == LOGAND)
return true;
} else if (!rparen && rop == LOGAND) {
if (!rparen && rop == LOGAND)
return true;
}
return false;
}
lint_assert(op == AND || op == XOR || op == OR);
if (!lparen && lop != op) {
if (lop == PLUS || lop == MINUS) {
if (lop == PLUS || lop == MINUS)
return true;
} else if (lop == AND || lop == XOR) {
if (lop == AND || lop == XOR)
return true;
}
}
if (!rparen && rop != op) {
if (rop == PLUS || rop == MINUS) {
if (rop == PLUS || rop == MINUS)
return true;
} else if (rop == AND || rop == XOR) {
if (rop == AND || rop == XOR)
return true;
}
}
return false;
}