From 24011bb0da0618639fe4f6ee38861500ffd84101 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 1 May 2018 02:48:41 -0400
Subject: [PATCH 1/2] Python 2.7.5 tolerance

---
 test/bytecode_2.7.5/01_while1.pyc      | Bin 0 -> 170 bytes
 test/simple_source/bug275/01_while1.py |   9 +++++++++
 uncompyle6/parsers/parse27.py          |   5 +++++
 3 files changed, 14 insertions(+)
 create mode 100644 test/bytecode_2.7.5/01_while1.pyc
 create mode 100644 test/simple_source/bug275/01_while1.py

diff --git a/test/bytecode_2.7.5/01_while1.pyc b/test/bytecode_2.7.5/01_while1.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..5fc9ef90080d9b1d078c54140bf1a3715f4480f8
GIT binary patch
literal 170
zcmZSn%*&;~`ywit0ScIav;z<q%L9oN28JjGhEyPfks+Ijp-7scf{me2lpzl&!o(1)
z!3<QB3B(MUj6lLq14Nd9Ovo+P0Fn#{qF52gEzZm>$VrVa&Mz%WPSsB;O*b+()i*GV
kFVD!#Nj20fs4U?Cs<O$=PbtkwwPOS601<4AJdDhY0973vAOHXW

literal 0
HcmV?d00001

diff --git a/test/simple_source/bug275/01_while1.py b/test/simple_source/bug275/01_while1.py
new file mode 100644
index 00000000..d7ef0649
--- /dev/null
+++ b/test/simple_source/bug275/01_while1.py
@@ -0,0 +1,9 @@
+# Issue #173. Bug is that 2.7.5 omits POP_BLOCK in
+# in later 2.7 grammar.
+#  while1stmt        ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM
+#  while1stmt        ::= SETUP_LOOP l_stmts_opt CONTINUE COME_FROM
+# which is included in later code generation
+ms=0
+if ms==1:
+    while 1:
+        pass
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index e1d74b22..c61e3f26 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -136,6 +136,11 @@ class Python27Parser(Python2Parser):
         whilestmt         ::= SETUP_LOOP testexpr returns
                               _come_froms POP_BLOCK COME_FROM
 
+
+        # 2.7.5 (and before to 2.7.0?)
+        while1stmt        ::= SETUP_LOOP l_stmts_opt JUMP_BACK COME_FROM
+        while1stmt        ::= SETUP_LOOP l_stmts_opt CONTINUE COME_FROM
+
         while1stmt        ::= SETUP_LOOP returns bp_come_from
         while1stmt        ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK COME_FROM
         whilestmt         ::= SETUP_LOOP testexpr l_stmts_opt JUMP_BACK POP_BLOCK _come_froms

From fdf97a1cc00ebf210d72936a9a09bcb0003db635 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Tue, 1 May 2018 03:10:46 -0400
Subject: [PATCH 2/2] Add if_not rule for Python 2.7

---
 test/bytecode_2.7_run/05_dict_comp.pyc | Bin 0 -> 578 bytes
 uncompyle6/parsers/parse27.py          |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 test/bytecode_2.7_run/05_dict_comp.pyc

diff --git a/test/bytecode_2.7_run/05_dict_comp.pyc b/test/bytecode_2.7_run/05_dict_comp.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..01ca52e91ab15bfeb0c5918e10213b0c489ae75e
GIT binary patch
literal 578
zcmbVI%}T>S5dL;sqbcY+2nqqA?ZsOuih9kVxfLZyveMWlTX(kpKzmW&z`HNtbNEEQ
zfHPZB&kcNEW@l%<`F2`gyPeOE_i=%ruf_ip1|2e$z$-8Y499J}C{(~ygZAMyo)t=s
zEZO49LNN(6<BUOjOr?_kC2-EISt567sFW#fM#i8n6YFx>)d4OwRthVPrNV7+z^xQv
z88UAgcM&VeBrlY&!;a|qYv<{q@{>g5*&xvEhpK7d`-C$HL`NJ^RnKQ8C%bTk=@qt~
zJ2Np2RkrE%kMpuBd@kAU{E1}1Kr)gTiav?|SjB3s`s;``pAuX?itiu}6)7)M@*8W@
zu)WbXAJg#W|7Y<tikL!qY8&Ha{ij66d4A4?bJqR&+GquShZP64Ef+I03?7Bz=o|Lx
BZc_jN

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index c61e3f26..b79e0390 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -33,6 +33,9 @@ class Python27Parser(Python2Parser):
         set_comp_func ::= BUILD_SET_0 LOAD_FAST FOR_ITER store comp_iter
                           JUMP_BACK RETURN_VALUE RETURN_LAST
 
+        comp_iter     ::= comp_if_not
+        comp_if_not   ::= expr jmp_true comp_iter
+
         comp_body ::= dict_comp_body
         comp_body ::= set_comp_body
         comp_for ::= expr for_iter store comp_iter JUMP_BACK