From fd36c77d2d2709111476151eebb203e3863abad4 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 14 Feb 2020 10:54:37 -0500
Subject: [PATCH] Bugs found in 2.4 branch testing

---
 test/bytecode_2.3/08_while1_if_continue.pyc    | Bin 0 -> 637 bytes
 test/bytecode_2.4/08_while1_if_continue.pyc    | Bin 305 -> 491 bytes
 test/bytecode_2.6/08_while1_if_continue.pyc    | Bin 336 -> 545 bytes
 test/bytecode_2.7/08_while1_if_continue.pyc    | Bin 333 -> 542 bytes
 .../looping/08_while1_if_continue.py           |  10 ++++++++++
 uncompyle6/parsers/parse23.py                  |  15 +++++++++++++--
 uncompyle6/parsers/parse24.py                  |  17 +++++++++++++++--
 7 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 test/bytecode_2.3/08_while1_if_continue.pyc

diff --git a/test/bytecode_2.3/08_while1_if_continue.pyc b/test/bytecode_2.3/08_while1_if_continue.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a2d50a562ce933e36c650dbf105098f8811f43cb
GIT binary patch
literal 637
zcmbu6Jx;?w5QX132?0YWP((uoG=?HS9TG*5kSHUh6i5`TjJ<}HjMvUOB1lw-i*XPx
z!3mhzU@Albws!oyv-3RP`1GR}zQ0}EB>1|BpJ%+>E{7C&1+H0;7lbsxENXEok%P@T
zmx2+8<q?WD>^|rjusfidV7s6yM0E%%2*jQ<ex)lBQNTr0BR*cbwm9iLbL%XW%1o}6
ziX{J?iueUSxPk1OhmsFDyO<|>m|I(#;%+!PQIGdrJXR)Ci7jeVEcBp!^1gE&r@1M#
zaJVh8qZYa(_hyht3$o;+9&F5FdF;Us7>tSfpk?20bU>HY9@A7U&<pS*nQvdhZRGhx
z#?EiJHP)-%T}Nac*ZO~i;;71a?sQKKw>dO?LKz0r)u?5{%_MvqtD@hNV)p0R3-QDc
JU4HvU_zCRwd@le1

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.4/08_while1_if_continue.pyc b/test/bytecode_2.4/08_while1_if_continue.pyc
index 96166f79c051300b07588af521f80428631f773b..9cf18747a4ecea19eb4dddcbd5280714b13464b1 100644
GIT binary patch
delta 268
zcmdnU^qSc$_Y*JI-Ggp%$qZ1y2&5f=xL6EGq%bhFFfc>`8H`{CBSQ)kL$C((MBR(^
z$t*wxAPmys48+CCK%zp1p@xwmpO=BLf|ntn5J-m?GBYqXF))CraG-&~8caZSewiR`
z8X%$sL?mf|i~=(ggTPESAip@jv?w{XgcZarNi0d#05TZBM3586loF7l_=3cu;#6KB
ntC$Z+FfcL$F*}&#V)6sq76cSx2;u+|$lS>SjIwMXV>r10U!fyy

delta 81
zcmaFOypc&a_Y*JIcK3$xWCkc;1kw&bT+9n3QWzLo7#N~}3`T}v4W@}^7lr&ZKq`Wm
QfdrH_`2?dZ3y{kI0B$r4(*OVf

diff --git a/test/bytecode_2.6/08_while1_if_continue.pyc b/test/bytecode_2.6/08_while1_if_continue.pyc
index 5c87045d056ad07b0641eee0c45d8269acdf0aef..7d47699dfb0202e586db2b744b23d1251c780dd2 100644
GIT binary patch
delta 233
zcmcb>w2;N@;wN6Ny9eFkk{O_Y5lA}#aj_VXNMT@TVPJ>?G8n-OMurq7hF}fmiMj{U
zl39QXKp3RM8HkJJfkcG_Lk%NCJ~snn1vf)LAumHAGXrB21Be0|7OVkM?56=F7&Jh7
zOF;ZYFqu@s24olKmlh?bmau}DC5a`e6DQaifyCnr5{rscc|pQlK!SmhnUNicIhg!3
bn1I|MFu@LFfz6&c!D+HRBQG0Bl#>epN|hr2

delta 71
zcmZ3;a)C+r;wN6N?d}cX$qZ1y2&5f=xR@76q%bhFFfc>`8H^0U8cY+-4siHsfK&uA
NO+LaH&H`jH000QD45<JB

diff --git a/test/bytecode_2.7/08_while1_if_continue.pyc b/test/bytecode_2.7/08_while1_if_continue.pyc
index eb9a7df46f1d7010746d74ea80b3584da63e5913..03aa5493c9ceb28c5dfd02f7dccfea5d869acdc0 100644
GIT binary patch
delta 233
zcmX@hG>^rM`7<xq-Ggp%$qZ1y2&5f=xL6EGq%bhFFfc>`8H`{CBSQ)kL$C((MBTk<
z$t*wxAPmys48+CqK%zo|p@xy6NQ9w+n<1c(hatR>nW2e+0Z4`e4GY!)DfZI<5)2w3
zy(J)iBA84nVFR*@^Gl18Q%hJu%#y^C)QP=zMj-L{g2bZYR9=uU7m#3JWM*UoVh$!h
c4JIHr2u!d8Szxm#_Bu_rVdP~4iE?rQ0O;)^)&Kwi

delta 71
zcmbQoa+XP#`7<xqrS7`$WCkc;1kw&bT+9n3QWzLo7#N~}3`T}v4W@}^dpZ0xKq`Wm
MCLd%BX92Pp0O%GBEdT%j

diff --git a/test/simple_source/looping/08_while1_if_continue.py b/test/simple_source/looping/08_while1_if_continue.py
index 3d72a7e8..eba6ead7 100644
--- a/test/simple_source/looping/08_while1_if_continue.py
+++ b/test/simple_source/looping/08_while1_if_continue.py
@@ -7,3 +7,13 @@ def readline (self):
                 continue
 
         return
+
+# From 2.4.6 sre.py
+# Bug in 2.4 and 2.3 was parsing the nested "while 1" with a "break" in it
+def _parse(a, b, source, state):
+    while 1:
+        if b:
+            while 1:
+                break
+        else:
+            raise
diff --git a/uncompyle6/parsers/parse23.py b/uncompyle6/parsers/parse23.py
index 166de860..a9f3b5c2 100644
--- a/uncompyle6/parsers/parse23.py
+++ b/uncompyle6/parsers/parse23.py
@@ -32,8 +32,19 @@ class Python23Parser(Python24Parser):
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        POP_TOP POP_BLOCK COME_FROM
 
-        while1stmt ::= _while1test l_stmts_opt JUMP_BACK
-                       COME_FROM POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= _while1test l_stmts_opt JUMP_BACK COME_FROM
+                       POP_TOP POP_BLOCK COME_FROM
+
+        # Python 2.3
+        # The following has no "JUMP_BACK" after l_stmts because
+        # l_stmts ends in a "break", "return", or "continue"
+        while1stmt ::= _while1test l_stmts
+                       POP_TOP POP_BLOCK
+
+        # The following has a "COME_FROM" at the end which comes from
+        # a "break" inside "l_stmts".
+        while1stmt ::= _while1test l_stmts COME_FROM JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
 
         list_comp  ::= BUILD_LIST_0 DUP_TOP LOAD_ATTR store list_iter del_stmt
         list_for   ::= expr for_iter store list_iter JUMP_BACK come_froms POP_TOP JUMP_BACK
diff --git a/uncompyle6/parsers/parse24.py b/uncompyle6/parsers/parse24.py
index b758c52a..411daaad 100644
--- a/uncompyle6/parsers/parse24.py
+++ b/uncompyle6/parsers/parse24.py
@@ -38,8 +38,21 @@ class Python24Parser(Python25Parser):
         _ifstmts_jump24 ::= c_stmts_opt JUMP_FORWARD POP_TOP
 
         # Python 2.5+ omits POP_TOP POP_BLOCK
-        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK COME_FROM
-        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_TOP POP_BLOCK
+        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
+        while1stmt ::= SETUP_LOOP l_stmts_opt JUMP_BACK
+                       POP_TOP POP_BLOCK
+
+        # Python 2.4
+        # The following has no "JUMP_BACK" after l_stmts because
+        # l_stmts ends in a "break", "return", or "continue"
+        while1stmt ::= SETUP_LOOP l_stmts
+                       POP_TOP POP_BLOCK
+
+        # The following has a "COME_FROM" at the end which comes from
+        # a "break" inside "l_stmts".
+        while1stmt ::= SETUP_LOOP l_stmts COME_FROM JUMP_BACK
+                       POP_TOP POP_BLOCK COME_FROM
 
         # Python 2.5+:
         #  call_stmt ::= expr POP_TOP