From 5dc8ced4a889d36be63f6119e5a055c44dfd9507 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 3 Mar 2005 07:01:48 +0000 Subject: Silence a gcc warning about putting in parentheses around && expressions mixed with || expressions. Also clarifies intend of 'if' conditional. --- Python/compile.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Python/compile.c b/Python/compile.c index 71e90f7..16bf291 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; -- cgit v0.12