From 9e815d8d794cfec435ea3d6893541b59893a05c3 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Sun, 4 Mar 2018 21:42:59 -0500
Subject: [PATCH] 2.6 and before COME_FROM handling...

also, add in some of the test bytecode from the python-2.4 branch
---
 test/bytecode_2.5/01_inplace_true_divide.pyc | Bin 0 -> 249 bytes
 test/bytecode_2.5/01_ops.pyc                 | Bin 0 -> 345 bytes
 test/bytecode_2.5/02_true_divide.pyc         | Bin 0 -> 238 bytes
 test/bytecode_2.5/08_if_while_else.pyc       | Bin 0 -> 428 bytes
 test/bytecode_2.5/10_del.pyc                 | Bin 0 -> 836 bytes
 test/simple_source/bug25/08_if_while_else.py |  13 +++++++++++++
 uncompyle6/parsers/parse26.py                |   3 +--
 uncompyle6/scanners/scanner2.py              |   8 +++++++-
 8 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 test/bytecode_2.5/01_inplace_true_divide.pyc
 create mode 100644 test/bytecode_2.5/01_ops.pyc
 create mode 100644 test/bytecode_2.5/02_true_divide.pyc
 create mode 100644 test/bytecode_2.5/08_if_while_else.pyc
 create mode 100644 test/bytecode_2.5/10_del.pyc
 create mode 100644 test/simple_source/bug25/08_if_while_else.py

diff --git a/test/bytecode_2.5/01_inplace_true_divide.pyc b/test/bytecode_2.5/01_inplace_true_divide.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ce7c8daa2300c6cce4e22f1c262889ac98dcdd4d
GIT binary patch
literal 249
zcmYLDO9}!p3{7W7kU_x%D7YL19TnV(cmfx?b5nF0rP%o}ZAI5Ey^P?^ynrSm7()79
zUedhhs~z7T-E9WH2<ct+0qlT)q7-lfFaov$1O|X1+=xVg5vTxqgj5KdB%*Qsrbq-K
z*W_(|)>fB=4v4Ih2KQqsQXahXHA=ZA298e}EWSIWX+w(RUoHvj|6+$kt<Ec&u%)jv
pO!xjcou%W6)J0`>8A?}slzds?sJdGAG0#io4KCP*WuG0<5+B{cHFE#}

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/01_ops.pyc b/test/bytecode_2.5/01_ops.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..569dc0eb6423b3a403833581c855c56185e229d9
GIT binary patch
literal 345
zcmY+Ay9&ZE6o&sat=58rgHAfQ6$CFh2r42tdRg4M6l{VDN{g|eZ{fT6W<G)EloBx^
zU%qo833-3&LF3ep5|qQIeM!r_2nq-yK$8hfOLH)@xm9Tr8*6J@ZCl$~+mX>>N<z6%
z4wQ$Zhlnx)npk1!mF6Om=qeu*ucxZmhc$ZCIbaBe%WxQy;W21o7Z!2RW6L4iopaBE
zkC0n`FdYib`I=pHY|{Le=)oaBj)#NcC{8oe&z^=qXMRmpe$flQ!L$ff5&Tct6m{_h
Dasn?)

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/02_true_divide.pyc b/test/bytecode_2.5/02_true_divide.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f0dacfe6a93f98963ec39efec500c6622282049b
GIT binary patch
literal 238
zcmYLDI|{-;5S>jTNFZQuV_~sa7_k=d1Qyz**&;i_;^xDCB-UQQOLzir<^^;{1c%|x
z=gs5I^Ht=Jdr{T!i<Iha2H@w^Xi5QR04typATR+;;U+*QFs(AsDI8@+hvrQo1$AM}
zI&(4JbgkjdUXFO56DW0xAv#p*KobNuv)Fz$#2HIWV9g+z|ASx9=uOkph3}%PvBaTw
f=-H)QtyORl729fD_E*nOY?@9-i`#^y3={DI2n{ps

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/08_if_while_else.pyc b/test/bytecode_2.5/08_if_while_else.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..ef12ea3d37ddc9734704e2f8b20b6e39e9c6cf00
GIT binary patch
literal 428
zcmbVH!Ab)$5S^q-Wx<0j{(;b*tOx}UB7)$}1*;(Rve?~GgS(q;lb}Mq`5Aseul|`|
z;G04G02AKJ@aAP+^7Xx&`OW9Nq~F!Uc@Bgjh>0pg714*Kxt026Y@wIp5*XkD2-l#s
zAwMOvw&V}UypAXm`F#jDGBUXRZfLnjMsT;hf@DQ%2Y;TZp4Om6$dZWMNr>A9X?EN~
zb-PL&MY_DN1FKJU7r9Y=QTy^a_Th-GVV~j{B`Jjws^FTg<|6pCDtWR<kH^!=(MjPR
zikByc24n1D_ZH;^UDDZMAR|m4yGO!9n}KsppGi+`xo>%<uNCQkv0(>SPa9vQn$P6F
HL1z5`jFL?8

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.5/10_del.pyc b/test/bytecode_2.5/10_del.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d7edcefa2befec90812df35238b4149672f293da
GIT binary patch
literal 836
zcmb7ByG{c!5FFdNI|ziN;87rfM8j2tX9oz0K1I?U1xjKQA|)KcM-e2b;Ad$0B7T7n
zAnZ6i1ft1FJG<-Kot?E`-YVtSi_NTy&o2>wBIch3>;f|2OacR2f{oBK$P}D{1&+k+
z+6sD-#aPS?oRlTlvori{<yf<`7a=RbNk6bp7k(W4sruwkkVSA&Adqf_CxatfMLUL_
z!y}L-xCGiVVm_oYsDf5n6S;jw&;&y$5h6lNC==et<8faC6fABB?0j#}vr{q8Yv>3y
zgqnwqfT7x@lH&*bx};lm-ydEN+_}$hZ@RATi(%pGJKN{h4YsaF1@&Cy`HDDCfiPhv
zslR6~OCk&3PbO<_CvlL#_C{E*`_)3<5(`ovWS@Ve-u<W^O((cX`VG?a5@C!ER83}+
zhy_z}l4(uM^EsemZB!%WYJVOs<qb7i6J(^bztVyl8u^tAuQ3SN4QQL8k&F|e5=^Pl
m&q&MRFt@h@cT6@<!J^buRia9!q7uC%QCY95nvT_M6zdOoaCy7{

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug25/08_if_while_else.py b/test/simple_source/bug25/08_if_while_else.py
new file mode 100644
index 00000000..df65657c
--- /dev/null
+++ b/test/simple_source/bug25/08_if_while_else.py
@@ -0,0 +1,13 @@
+# From 2.3 Queue.py
+# Bug was adding COME_FROM from while
+# confusing the else
+def put(item, block=True, timeout=None):
+    if block:
+        if timeout:
+            while True:
+                if item:
+                    block = 1
+        else:
+            block = 5
+    elif item:
+        block = False
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 945aeab8..8af0bb0d 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -115,8 +115,7 @@ class Python26Parser(Python2Parser):
 
         # Semantic actions want else_suitel to be at index 3
         ifelsestmtl ::= testexpr c_stmts_opt cf_jb_cf_pop else_suitel
-
-        ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop else_suitec
+        ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop    else_suitec
 
         # Semantic actions want suite_stmts_opt to be at index 3
         withstmt ::= expr setupwith SETUP_FINALLY suite_stmts_opt
diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py
index 2fb6f207..7616d9a9 100644
--- a/uncompyle6/scanners/scanner2.py
+++ b/uncompyle6/scanners/scanner2.py
@@ -1127,7 +1127,13 @@ class Scanner2(Scanner):
                                     source = self.setup_loops[label]
                                 else:
                                     source = offset
-                                targets[label] = targets.get(label, []) + [source]
+                                # FIXME: The grammar for 2.6 and before doesn't
+                                # handle COME_FROM's from a loop inside if's
+                                # It probably should.
+                                if (self.version > 2.6 or
+                                    self.code[source] != self.opc.SETUP_LOOP or
+                                        self.code[label] != self.opc.JUMP_FORWARD):
+                                    targets[label] = targets.get(label, []) + [source]
                                 pass
                             pass
                         pass