From f1e48fb60aa522bc7471c2f65c50b6c79454b96c Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Fri, 27 Apr 2018 10:57:27 -0400
Subject: [PATCH] while1 grammar rule cleanup

Closes #172
---
 test/bytecode_2.7/04_while1_while1.pyc         | Bin 0 -> 407 bytes
 test/bytecode_3.4/04_while1_while1.pyc         | Bin 370 -> 385 bytes
 test/bytecode_3.6/04_while1_while1.pyc         | Bin 0 -> 337 bytes
 test/simple_source/looping/04_while1_while1.py |   7 ++++++-
 uncompyle6/parsers/parse23.py                  |   5 +----
 uncompyle6/parsers/parse27.py                  |   1 -
 6 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 test/bytecode_2.7/04_while1_while1.pyc
 create mode 100644 test/bytecode_3.6/04_while1_while1.pyc

diff --git a/test/bytecode_2.7/04_while1_while1.pyc b/test/bytecode_2.7/04_while1_while1.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..63c229f80d232d682a19484ff541fbe358112289
GIT binary patch
literal 407
zcmYjM%SyyB6g^4m;FOt#2<}|DDJpFRHv=MW23(2gqA)IsGmT@hZQ8WOxSc=n2VDAN
zeu6*XP3)i{IrpA>?knPZ>YLfuVuj%_vRCxlPXcoc3Fsr3L+2dewgM!>hM}1tX~dQY
zBqnk>F(ikcZ-ob#eHTfP0SkfVn(AWEP0Y+G8<<n)^#9wxP}<UUd`HHx@L=ih=q1$>
z|3H#)+y{bI&37ztf}6m)-7Z0zKIMf>({4iKuCKbhlyj|>9@Ofww5rWtYt`4C{k;hY
z@CWS)(J*TBvZh|G>h(%Sg;I51t)uuneSM}GXM+jrH`n{3R9RohOS@1T5(qY8_IYf|
VeQv!G8;dd9bJ0PuG46YU{Qw9LO%wnC

literal 0
HcmV?d00001

diff --git a/test/bytecode_3.4/04_while1_while1.pyc b/test/bytecode_3.4/04_while1_while1.pyc
index 6ce08f29a1e518b351304cf4d819b5078800b28f..37ef4fcf1558370e5b2a30227911c6ac52bc2220 100644
GIT binary patch
delta 285
zcmYjLy9&ZU5S+bBM1vMV!OF_Y2WqTLXCqjNU~v#TNh(1|M7U1$4}xH6Dfl&hgq4kj
zrInjg!DV-uo!Qq@?4<W7mK^Qhf};R#_%mWW<XE3M=_Vo|sYBONud-FKL`2vV7%1H}
zVh@o(GWrQ~=(1rHLLiWc$53$(>`MDa*+aJt*kHQCZ*a+N3$rmrNC+%s<>%UhXDw9Y
z6I3WLYskCJ-`)9lOd582ZMph_B+sQuuU4mfDAJ(cVMbDpvaqNm9Fd_M6=Z>2!+w>F
I6OJY64X5rfKmY&$

delta 270
zcmZo<{={VXj)#|P&!pGk;!F$-j~S2vBarO?#Kp6KM1=-JDg#525<`W|L_?AKLS}|k
zMusLv1|XwC4=e>FnHY+kVd9Yt6~bVVP=*u+hA3u+LN|u+LOli`sxSvj)G<_OGo-RG
z6csT9<T1eXWiS-RgU#z@NMU4%Vg+*{R>d=<FfjycGQVWy2D<1a(7g<PnrstqYYSE0
zVysxnP{auo0TaJ8CyO&$=xG7@%#3V|Ak4zZ!^Fu1VzDuDGIKHtfJLD)ATcHYD)lXX

diff --git a/test/bytecode_3.6/04_while1_while1.pyc b/test/bytecode_3.6/04_while1_while1.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..0e1db0631a7ca34f69699a53ffd14c7ba8a38164
GIT binary patch
literal 337
zcmYjLJxjzu5S^VQ#}aZ@7FHsuJcQ)@XoN#7&c@<6v<ReG#H?o^$tD}4YkNP!|KMLr
zd)55~D`#U07v|05&6_uSIi33EdY677zz+UBM*NnleJ3!-67-QdBs^GyWLwto1R5L|
zCSXoz5=zwbK?zMje33!wG#BIx$#F_bN;#<4W5PX6mb8~;EOm+5)FnCHrb-~gN0>Q#
zkB;x@Yp|MmJs097FQgEC@X%Fnc`5I-R@&;-Q)zW?qg7Y;%zT69v^BubSroT<S<_~#
zI{hr;La92hHu3yQe7sWP`PicRv*(LaWnCd}?A10RK<2W)@{yxuE}J+L7L2N$`c^~k
GBKrk6;!cPF

literal 0
HcmV?d00001

diff --git a/test/simple_source/looping/04_while1_while1.py b/test/simple_source/looping/04_while1_while1.py
index 10c106c2..41106b0c 100644
--- a/test/simple_source/looping/04_while1_while1.py
+++ b/test/simple_source/looping/04_while1_while1.py
@@ -19,10 +19,15 @@ while 1:
 while 1:
     if __name__:
         while 1:
-            if y:
+            if __name__:
                 break
             raise RuntimeError
     elif __file__:
         x = 2
     else:
         raise RuntimeError
+
+# Degenerate case. Note: we can't run becase this causes an infinite loop.
+# Suggested in issue #172
+while 1:
+    pass
diff --git a/uncompyle6/parsers/parse23.py b/uncompyle6/parsers/parse23.py
index cc8462c9..6e29d9e8 100644
--- a/uncompyle6/parsers/parse23.py
+++ b/uncompyle6/parsers/parse23.py
@@ -1,4 +1,4 @@
-#  Copyright (c) 2016-2017 Rocky Bernstein
+#  Copyright (c) 2016-2018 Rocky Bernstein
 #  Copyright (c) 2000-2002 by hartmut Goebel <hartmut@goebel.noris.de>
 #  Copyright (c) 1999 John Aycock
 
@@ -32,9 +32,6 @@ class Python23Parser(Python24Parser):
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        POP_TOP POP_BLOCK COME_FROM
 
-        while1stmt ::= _while1test l_stmts_opt JUMP_BACK
-                       POP_TOP POP_BLOCK
-
         while1stmt ::= _while1test l_stmts_opt JUMP_BACK
                        COME_FROM POP_TOP POP_BLOCK COME_FROM
 
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index c9b0bca5..d8e6b3fa 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -171,7 +171,6 @@ class Python27Parser(Python2Parser):
     def customize_grammar_rules(self, tokens, customize):
         # 2.7 changes COME_FROM to COME_FROM_FINALLY
         self.remove_rules("""
-        while1stmt     ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM
         while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suite COME_FROM
         tryfinallystmt ::= SETUP_FINALLY suite_stmts_opt POP_BLOCK LOAD_CONST COME_FROM suite_stmts_opt END_FINALLY
         """)