Silence a gcc warning about putting in parentheses around && expressions mixed

with || expressions.  Also clarifies intend of 'if' conditional.
This commit is contained in:
Brett Cannon 2005-03-03 07:01:48 +00:00
parent 6a458e9bc9
commit 5dc8ced4a8

View File

@ -778,13 +778,14 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
h = i - 3 * j; h = i - 3 * j;
if (h >= 0 && if (h >= 0 &&
j <= lastlc && j <= lastlc &&
(opcode == BUILD_TUPLE && ((opcode == BUILD_TUPLE &&
ISBASICBLOCK(blocks, h, 3*(j+1)) || ISBASICBLOCK(blocks, h, 3*(j+1))) ||
opcode == BUILD_LIST && (opcode == BUILD_LIST &&
codestr[i+3]==COMPARE_OP && codestr[i+3]==COMPARE_OP &&
ISBASICBLOCK(blocks, h, 3*(j+2)) && ISBASICBLOCK(blocks, h, 3*(j+2)) &&
(GETARG(codestr,i+3)==6 || GETARG(codestr,i+3)==7)) && (GETARG(codestr,i+3)==6 ||
tuple_of_constants(&codestr[h], j, consts)) { GETARG(codestr,i+3)==7))) &&
tuple_of_constants(&codestr[h], j, consts)) {
assert(codestr[i] == LOAD_CONST); assert(codestr[i] == LOAD_CONST);
cumlc = 1; cumlc = 1;
break; break;