From 8a4189bc0eb32294d8348453937a632d488dd2ec Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Mon, 15 Apr 2019 20:32:15 -0400
Subject: [PATCH] Python 2.6-2.7ish generator handling

---
 .../02_ifelse_comprehension.pyc               | Bin 0 -> 1000 bytes
 test/bytecode_3.1/02_ifelse_comprehension.pyc | Bin 684 -> 0 bytes
 .../02_ifelse_comprehension.pyc               | Bin 0 -> 1031 bytes
 test/bytecode_3.3/02_ifelse_comprehension.pyc | Bin 783 -> 0 bytes
 .../02_ifelse_comprehension.pyc               | Bin 0 -> 1093 bytes
 .../02_ifelse_comprehension.pyc               | Bin 0 -> 719 bytes
 .../bug31/02_ifelse_comprehension.py          |  28 +++++++++++-------
 uncompyle6/parsers/parse26.py                 |   2 ++
 uncompyle6/parsers/parse27.py                 |   1 +
 9 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 test/bytecode_2.6_run/02_ifelse_comprehension.pyc
 delete mode 100644 test/bytecode_3.1/02_ifelse_comprehension.pyc
 create mode 100644 test/bytecode_3.1_run/02_ifelse_comprehension.pyc
 delete mode 100644 test/bytecode_3.3/02_ifelse_comprehension.pyc
 create mode 100644 test/bytecode_3.3_run/02_ifelse_comprehension.pyc
 create mode 100644 test/bytecode_3.6_run/02_ifelse_comprehension.pyc

diff --git a/test/bytecode_2.6_run/02_ifelse_comprehension.pyc b/test/bytecode_2.6_run/02_ifelse_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..1b2c002a98785acb9d9e03de82365f389eef98bf
GIT binary patch
literal 1000
zcmbVJ%Wl(95Ixt<qp2vnuGt!p(k9s;QB_ntmRUFmBm|0reG`o0M}4oQAi;(r(jS5)
z|G=;C1)Lcdia=~)dCr}C=XGZ0`;UYDueZLuOmOw}c|M@HZ-f;11iYYPR57sB1FVdo
z<uyPWBJJR!C&+jHZv#|)7$4%JfoUVsE>`sIYEb8opiq-3(&7K1w)0P@*1M|ucWBzf
zERtT59zmo_2`TP2;eCKDur=6H39%$2gU^7c3AiwLMBzV+0(wsqLljLCOepRiVKWlv
zS9kEi;1VbgVJ<_IY@KsEzsp;IqQgU{^30s~@SJ7ZoSE>MMg(XLFX@NJUMgi#hp6g8
z-;+sujN4<RVQxq#m*v&k&RyBmi9LGVtR|zQ<MBLO+O@Ouq|B?@zOjYN%3@f(a|4E)
ztZZR7ReicA@ltjWL{ip^)fP=|>xH+G49yD>=W`#6pE62fVIGSimT|N#=v935t+k5Z
z4kW!4wi|B?E|D1oU_x^k=o)^l;-T2~3BPwX(=MiMFG6UYIp5xdDBEtiQs0S}Bw3c_
zfrLw|Fqz=>C^F$TjdVUT%lHOCNBFdEtiQ?InRB-G+{WX&E^9BYPZnI&H8a(A8QUIn
Vo#bWOtnH}|P96sRK{z(|%}+2OvXKA)

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.1/02_ifelse_comprehension.pyc b/test/bytecode_3.1/02_ifelse_comprehension.pyc
deleted file mode 100644
index f82a46b0b81f7e5b3e53fbd92407b79a3e59adb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 684
zcmbVI%}T>S5T0!%Rk0Tzz^lbWTP=986c2i>2SG%TC2l4$m`&2%tW?lb#rBzeBhS8o
zGn;_D6}s%qe$3|k$=)1v_kX^B?-i^qLHLr&cBw@Gp8yX81l;yoG*NA8y!hN{PJ2RN
z1+b(oVA+DW&5SRAisk|q0<NfN3sS6wriz_-u`H{NsO&YhcYwzW_z)~f?3Vz{5LPW%
z0GQ(j%+4E-2Mve?Bm(ZljJ(-|<)=Mr;DbB1=?@)`(;oYIs2u-<t#svf38+GsX@<u0
zT%WH}U1lh4;f%t;lS@XYgW;J>W6Uf{{@&m-<~A+ze);D1h%!zv$9ZWcUYdP_j*sJS
zF?SkGSYaJv-Ss~Ur&M+LO;NW=c|`IO=N0CWd<`>)R>p;q+GSN*h9=aOQ`>+Vh_*QF
aOzZrcd39#yZT*D&B4b@dF2jkB!D@e{OOyBj

diff --git a/test/bytecode_3.1_run/02_ifelse_comprehension.pyc b/test/bytecode_3.1_run/02_ifelse_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..febcc11895fd7957327e678fdf9def88d752f375
GIT binary patch
literal 1031
zcmbVJO>fgc5PfT>`KTy2P8?7rgv=#P>l0E{@!4ZIr0SspMZw+#i`Y(gy;2cyp{U6Z
zq7^@nH*5C;frONm=k0iR-t3#1xA(R-uO3~#OK@j(=s%~~UxXC+0i4iL-ciu>1I(15
zCU%g9NLx5>3-X-brvUaPsu16=<I@ey0uY7Ly+a9oDvt~h;+KCByMGb=Tg{6#@n=I!
z+ZaVXici`ES+Z}?LYjR__!?jdEESe?LQGpy-vv<d3OHAIP2)F;0!9xLMU*9fk|d_t
z0fEu)pWvIq3NYJPg)k4LX{V2|3Q&Yt`Gy>;Q#R>3UnW|H5dl8GleGPTlUK5+MfC2(
zpC@s>?bX|^r@20ZY?d$PdTdK)620@m&Enmi!QMEV>bce9q|6saf7FG|%A&vc?4%?6
zGhOJjg*oU7U!H9Tkv!{fb>VVtCY6q)VNQhDDz6$b5|%U~{*V;cmHbEdI+8_(KC5)W
zky48QRHz;VHv<t-QpPKq-6Y&haOCS6*42r&d1kBnPbSDl)UxSg9c_|iT9#Yfd?TSU
zpGwpu&9LH3^bL;=Bbm6nEyp!%-{T|Ww7buM7uIT1aa?bVDUB1(;e@li73#fp)OML`
VKQB`^*9X3ra?tDa!hw3GegpVuy$b*U

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.3/02_ifelse_comprehension.pyc b/test/bytecode_3.3/02_ifelse_comprehension.pyc
deleted file mode 100644
index a0c342af8cb5d4345aa263f879c2f9c6b266f23f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 783
zcmbVJO-sW-5S>jWRk7g3t5<t5Z7p~)6c2jsMGzEZiRq*UHy_>2N(DVtY_I+Sul`ME
zHbFdyg)Xx*FO$4C`!=6@o!yVG&P^x)V)(T@!soQjKBWnTfH#0!0v=p-Thxp>@#4DG
zRC7#V1+b(Lu=F5lF_lQ~02RIRU?JdwHiaPFT5BBBe7ATm3l3?UOG+;QcW3Y_Se4k1
zKIlHIh!3ET8ZbL;K<+mn5ik{SEoL;Hhp_y(O9{F>!Ey@vmfNXw<6vyJsSy`hnJUzl
zO_?gI9M1;)lxC$uX$q@j?A_bxaM0_Y$TUG^P%=^D1Lh_z@}PXSJ46YmnB%<EBd5l5
z{k9!YkvOj~pU9_3Su`>!w9Krk(lXLfW`a-^aiq*B_z`d>oF?WrLmgFEAN|im*M@4#
we4+mt+{D}AS_|ye_>@4j#6jDxXN+r$>p!e*vGm6OhA%D5iiuS?awlcAZ$1LG9smFU

diff --git a/test/bytecode_3.3_run/02_ifelse_comprehension.pyc b/test/bytecode_3.3_run/02_ifelse_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..183f8eaec5ea4f147ee545220d1fd4d04e3e3c98
GIT binary patch
literal 1093
zcmbVKO^Xvj5Pdz9kKLH{yy8KGMdl#0vzwC;f}$>-a>?RBln`esad1Ae-P5pw9(2Xz
zSNJdV;KARvRXs^IpdzH{epS;`ulrS1fA1c2e%|}>I`V)RTcgeXV_xPrL&8(xEAWaP
z4~g%51>(;JW=fD4_mMP_v~blD<b9s+J(w4$e0*8QCvD95khY_AwkS<^ltT^>;^)5+
zJAV+}U8@^w;;$7k*~2Kf#VN!s1{q?TynJ5fA;U)x3t*wJV8_R_A-Qsv-++q$0#^#p
zc<~$s!WzbkQ3e;ytsYwwF>v&o2l%A01oV9@74%)H-o+7?9ts~zUvhk@E_}IV6vzpw
z$QcF<aNkxo!^p}lY0zMF?!@iKC$%}PP0!J6$U!E}=NXMnX?0A;Z|$siavYtG(<x<!
z#&Ma?HNB(4q-7D#KiGYy^k-Di<y;T;gfG{&JbQ-?T~<^iVLvP5NoEG&CNL0Dj!T8j
zNlz*Yq@q@2nkuhWQY9?@x8VO}wM#-Gqt-2+5rFd5p=WRYY&s|UB;TjJOow69>XA!v
zSSKo3WvQv^FKIqktnL*1*hQusGA+vkHm>4OcD0qdBSlrb?rthNhv#R3Jdv$D))ZIv
xb8X4q=71;0kgmAD&$TYK70wyAk8T9-{95FJ^z$;Y84X-{Wux2f`jL91t^vv`&949e

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.6_run/02_ifelse_comprehension.pyc b/test/bytecode_3.6_run/02_ifelse_comprehension.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..021db2f8b48c187f21f392fc8213ed0bcd9aae50
GIT binary patch
literal 719
zcmZ8eO>fgc5ZxKOj$IT~^?*P^q6dWJi<>srC;}BY<^t-W0!6{QF&6$vXC0}aAXTJN
z@>lo)@MC=Cl)umuGaFO_E4`Vq_RX8O<9@fh|MSU@cRf_<m)bcUuAejPH3zLU+^7qs
zQG1-hDD7vUeFJ(=2fDLlWRSrpw7mwuxqBUEs6%E%e;5IGFfwG;`9G{^hs8QhOIQnG
z>HRk<zLy4ULyqJ<hR3i+92U4zD_G&moBA3w-h_=>s3p8)EP;EyQ3}kH!;f_6bGA=8
zEY$nQUtz82!5ZjLtILOLtZ?mRaIQdIq80(%$iUHeu3AibE#$G^!lcFYgmKE~lPKRN
zHZNy|8QXeJsX6{I&-y3Fz0+|%HH9_fv@U04KAOtrb(PFM-$sMXROV_%!%z%~hL2w!
znXATBIvEsoIw|Zhxnsr9My8sVh9-@PgA3m_WkX`Fg_LA7B)^SB%{hvFcl-ZUBptza
zjC5JITtGNL>hky9zGQFW>P$$Yx?L^r1V(JeFLK*(_V^iY-ZnUSZ(7%)<zA(L4!GVh
z)Z4!vH=_S~6nk!}qqO&5SZk=^4ZR|&X-8I!kkbwaWv%Ch89MXgE9`{c5j=z6fx3`<

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug31/02_ifelse_comprehension.py b/test/simple_source/bug31/02_ifelse_comprehension.py
index e3d7e92c..769b09bd 100644
--- a/test/simple_source/bug31/02_ifelse_comprehension.py
+++ b/test/simple_source/bug31/02_ifelse_comprehension.py
@@ -1,12 +1,18 @@
-# Python 2.7 sqlalchemy-1.013/sql/crud.py
-def _extend_values_for_multiparams(compiler, stmt, c):
-    c(
-        [
-            (
-                (compiler() if compiler()
-                    else compiler())
-                if c in stmt else compiler(),
-            )
-        ]
-        for i in enumerate(stmt)
+# Adapted from Python 2.7 sqlalchemy-1.013/sql/crud.py
+# Bug was in handling generator comprehension
+# In 2.6, 2.7 JUMP_ABSOLUTEs rather than JUMP_BACKs are generated
+
+# RUNNABLE!
+def extend(stmt, a, c, c1, c2, c3):
+    return c(
+        ([ (5 if c1 else c2)
+          if a else c3
+        ] 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']]
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 23091189..172f4ea3 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/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
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index 004a0dff..c960eb21 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/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):