Python 2.6-2.7ish generator handling

test/simple_source/bug31/02_ifelse_comprehension.py

@@ -1,12 +1,18 @@
-# Python 2.7 sqlalchemy-1.013/sql/crud.py
+# Adapted from Python 2.7 sqlalchemy-1.013/sql/crud.py
-def _extend_values_for_multiparams(compiler, stmt, c):
+# Bug was in handling generator comprehension
-    c(
+# In 2.6, 2.7 JUMP_ABSOLUTEs rather than JUMP_BACKs are generated
-        [
+
-            (
+# RUNNABLE!
-                (compiler() if compiler()
+def extend(stmt, a, c, c1, c2, c3):
-                    else compiler())
+    return c(
-                if c in stmt else compiler(),
+        ([ (5 if c1 else c2)
-            )
+          if a else c3
-        ]
+        ] for i in enumerate(stmt))
-        for i in enumerate(stmt)
     )
+
+def foo(gen):
+    return list(gen)
+
+assert extend([0], 0, foo, True, 'c2', 'c3') == [['c3']]
+assert extend([0, 1], 1, foo, False, 'c2', 'c3') == [['c2'], ['c2']]
+assert extend([0, 1], False, foo, False, 'c2', 'c3') == [['c3'], ['c3']]

uncompyle6/parsers/parse26.py

@@ -267,6 +267,8 @@ class Python26Parser(Python2Parser):
         # Note: preserve positions 0 2 and 4 for semantic actions
         conditional_not    ::= expr jmp_true  expr jf_cf_pop expr COME_FROM
         conditional        ::= expr jmp_false expr jf_cf_pop expr come_from_opt
+        conditional        ::= expr jmp_false expr ja_cf_pop expr
+
         expr               ::= conditional_not
 
         and                ::= expr JUMP_IF_FALSE POP_TOP expr JUMP_IF_FALSE POP_TOP

uncompyle6/parsers/parse27.py

@@ -123,6 +123,7 @@ class Python27Parser(Python2Parser):
         conditional_true ::= expr JUMP_FORWARD expr COME_FROM
 
         conditional      ::= expr jmp_false expr JUMP_FORWARD expr COME_FROM
+        conditional      ::= expr jmp_false expr JUMP_ABSOLUTE expr
         """
 
     def p_stmt27(self, args):