From: Brett Cannon <bcannon@gmail.com>
Date: Thu, 3 Mar 2005 07:01:48 +0000 (+0000)
Subject: Silence a gcc warning about putting in parentheses around && expressions mixed
X-Git-Tag: v2.5a0~1985
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5dc8ced4a889d36be63f6119e5a055c44dfd9507;p=python

Silence a gcc warning about putting in parentheses around && expressions mixed
with || expressions.  Also clarifies intend of 'if' conditional.
---

diff --git a/Python/compile.c b/Python/compile.c
index 71e90f7e21..16bf291708 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -778,13 +778,14 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
 			h = i - 3 * j;
 			if (h >= 0  &&
 			    j <= lastlc  &&
-			    (opcode == BUILD_TUPLE && 
-			     ISBASICBLOCK(blocks, h, 3*(j+1)) ||
-			     opcode == BUILD_LIST && 
+			    ((opcode == BUILD_TUPLE && 
+			     ISBASICBLOCK(blocks, h, 3*(j+1))) ||
+			     (opcode == BUILD_LIST && 
 			     codestr[i+3]==COMPARE_OP && 
 			     ISBASICBLOCK(blocks, h, 3*(j+2)) &&
-			     (GETARG(codestr,i+3)==6 || GETARG(codestr,i+3)==7)) &&
-			    tuple_of_constants(&codestr[h], j, consts)) {
+			     (GETARG(codestr,i+3)==6 ||
+				      GETARG(codestr,i+3)==7))) &&
+			     tuple_of_constants(&codestr[h], j, consts)) {
 				assert(codestr[i] == LOAD_CONST);
 				cumlc = 1;
 				break;