[Jython-checkins] SF.net SVN: jython:[5469] trunk/jython/src/org/python/compiler/CodeCompiler .java

[<pj...@us...>]

Revision: 5469
          http://jython.svn.sourceforge.net/jython/?rev=5469&view=rev
Author:   pjenvey
Date:     2008-10-19 20:51:56 +0000 (Sun, 19 Oct 2008)

Log Message:
-----------
move the last visitCompare fix to after the end label so we also avoid the
issue when a chained comparison fails fast

Modified Paths:
--------------
    trunk/jython/src/org/python/compiler/CodeCompiler.java

Modified: trunk/jython/src/org/python/compiler/CodeCompiler.java
===================================================================
--- trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-19 15:16:29 UTC (rev 5468)
+++ trunk/jython/src/org/python/compiler/CodeCompiler.java	2008-10-19 20:51:56 UTC (rev 5469)
@@ -1374,15 +1374,15 @@
         code.swap();
         visitCmpop(node.ops[n-1]);
 
-        code.aconst_null();
-        code.astore(last);
-        code.freeLocal(last);
-
         if (n > 1) {
             code.astore(result);
             code.label(end);
             code.aload(result);
         }
+
+        code.aconst_null();
+        code.astore(last);
+        code.freeLocal(last);
         code.freeLocal(result);
         return null;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.