From: Armin Rigo <arigo@tunes.org>
Date: Sat, 30 Oct 2004 21:08:59 +0000 (+0000)
Subject: Fixed a comment and added another one.
X-Git-Tag: v2.4b2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7bcf4deb174e5e5b6548eb64fe2b0735da5dc95;p=thirdparty%2FPython%2Fcpython.git

Fixed a comment and added another one.
---

diff --git a/Python/compile.c b/Python/compile.c
index 137b46d27433..f8083074070b 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -651,7 +651,7 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
 		        "if a and b:"
 			"if a or b:"
 		        "a and b or c"
-			"a and b and c"
+			"(a and b) and c"
 		   x:JUMP_IF_FALSE y   y:JUMP_IF_FALSE z  -->  x:JUMP_IF_FALSE z
 		   x:JUMP_IF_FALSE y   y:JUMP_IF_TRUE z  -->  x:JUMP_IF_FALSE y+3
 			where y+3 is the instruction following the second test.
@@ -749,6 +749,9 @@ optimize_code(PyObject *code, PyObject* consts, PyObject *names, PyObject *linen
 		while (adj--)
 			codestr[h++] = codestr[i++];
 	}
+	/* The following assertion detects the presence of NOPs in the input
+	   bytecode.  The compiler never produces NOPs so far; if one day it
+	   does, the way 'nops' is counted above must be changed. */
 	assert(h + nops == codelen);
 
 	code = PyString_FromStringAndSize((char *)codestr, h);