From 06023c247de76a2351e49d2c2046cb45b47b76cf Mon Sep 17 00:00:00 2001
From: rocky <rocky@gnu.org>
Date: Thu, 7 Jul 2016 13:07:16 -0400
Subject: [PATCH] while1 bug in 2.6 and 2.7

---
 test/bytecode_2.6/08_while1_if_continue.pyc       | Bin 0 -> 336 bytes
 test/bytecode_2.7/08_while1_if_continue.pyc       | Bin 0 -> 333 bytes
 .../looping/08_while1_if_continue.py              |   9 +++++++++
 uncompyle6/parsers/parse26.py                     |   1 -
 uncompyle6/parsers/parse27.py                     |   2 ++
 uncompyle6/scanners/scanner2.py                   |   2 +-
 6 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 test/bytecode_2.6/08_while1_if_continue.pyc
 create mode 100644 test/bytecode_2.7/08_while1_if_continue.pyc
 create mode 100644 test/simple_source/looping/08_while1_if_continue.py

diff --git a/test/bytecode_2.6/08_while1_if_continue.pyc b/test/bytecode_2.6/08_while1_if_continue.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..51685e7dd55f51a0b09bf20444b01972a616847e
GIT binary patch
literal 336
zcmbtPu?oU45WQ;!rQ+hOn?on7n}dkp?x2I<5~NKvkS5i(s31;mew}`bU*KJ<_yH!|
zd&lM8d*tzIdC&WG6~gBr@suiS5kvqtfHgG;OW&bM$nW2p@m`PM)P)OxZ3E^+b-=v~
z`wpN%K=N2}`K+3km^Y{uB34=oQB7)WC3Wl*LkU@*M=D8aDYL~Pl!3N3Rc0FuM&h_5
z@ldE(gx2KB6tbV5OW%XsL|Pf?vfN`kbg@pi=~U?p{>Lxpuds1qqe9C`8OB*}u}(vC

literal 0
HcmV?d00001

diff --git a/test/bytecode_2.7/08_while1_if_continue.pyc b/test/bytecode_2.7/08_while1_if_continue.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..eb9a7df46f1d7010746d74ea80b3584da63e5913
GIT binary patch
literal 333
zcmZSn%*%DDyDmJL0SXv_v;z<q^8$$!28I>}hA1F|ks(-v2`G{bl80eukUB*mQ6a@p
z!@y7^!B7Gw3z-=TB^dI+`h&xPh6HPXwD^I^5)L3UK0YloCpA7EBEkYPCp9Nc14uJ~
ziDEsFP-bocP*HJyX;E^jeolUVL1tdMzJW!2c?M9kVSHv<d~$wXNoHPYs$M}Q*xaJj
u#FU)Oyi{h8b}o={jLeK|K*-4iu{{Xn34}cqS!R=)pHiBWY6rFqWETM90z(G?

literal 0
HcmV?d00001

diff --git a/test/simple_source/looping/08_while1_if_continue.py b/test/simple_source/looping/08_while1_if_continue.py
new file mode 100644
index 00000000..3d72a7e8
--- /dev/null
+++ b/test/simple_source/looping/08_while1_if_continue.py
@@ -0,0 +1,9 @@
+# 2.6.9 text_file.py
+# Bugs in 2.6 and 2.7 detecting structure
+def readline (self):
+    while 1:
+        if self:
+            if __file__:
+                continue
+
+        return
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
index 420a062a..51df0a32 100644
--- a/uncompyle6/parsers/parse26.py
+++ b/uncompyle6/parsers/parse26.py
@@ -145,7 +145,6 @@ class Python26Parser(Python2Parser):
         whileelsestmt ::= SETUP_LOOP testexpr l_stmts_opt jb_pop POP_BLOCK
                           else_suite COME_FROM
 
-
         while1stmt ::= SETUP_LOOP return_stmts bp_come_from
 
         return_stmt ::= ret_expr RETURN_END_IF come_from_pop
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index cacf206b..7bb94890 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -50,6 +50,8 @@ class Python27Parser(Python2Parser):
         withasstmt ::= expr SETUP_WITH designator suite_stmts_opt
                 POP_BLOCK LOAD_CONST COME_FROM
                 WITH_CLEANUP END_FINALLY
+
+        while1stmt ::= SETUP_LOOP l_stmts POP_BLOCK COME_FROM
         """
 
 
diff --git a/uncompyle6/scanners/scanner2.py b/uncompyle6/scanners/scanner2.py
index 56c57ba4..ee2072bd 100755
--- a/uncompyle6/scanners/scanner2.py
+++ b/uncompyle6/scanners/scanner2.py
@@ -439,7 +439,7 @@ class Scanner2(scan.Scanner):
                     # Is jump back really "back"?
                     jump_target = self.get_target(jump_back, code[jump_back])
                     if (jump_target > jump_back or
-                        code[jump_back+3] == self.opc.JUMP_FORWARD):
+                        code[jump_back+3] in [self.opc.JUMP_FORWARD, self.opc.JUMP_ABSOLUTE]):
                         jump_back = None
                         pass
                 else: