[Python-checkins] python/dist/src/Python compile.c,2.347,2.348
bcannon at users.sourceforge.net
bcannon at users.sourceforge.net
Thu Mar 3 08:01:54 CET 2005
Update of /cvsroot/python/python/dist/src/Python
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14611/Python
Modified Files:
compile.c
Log Message:
Silence a gcc warning about putting in parentheses around && expressions mixed
with || expressions. Also clarifies intend of 'if' conditional.
Index: compile.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Python/compile.c,v
retrieving revision 2.347
retrieving revision 2.348
diff -u -d -r2.347 -r2.348
--- compile.c 23 Feb 2005 13:37:55 -0000 2.347
+++ compile.c 3 Mar 2005 07:01:48 -0000 2.348
@@ -778,13 +778,14 @@
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;
More information about the Python-checkins
mailing list