From f274ac0e3bb5ae1654f3c3cc1314a9b752341b33 Mon Sep 17 00:00:00 2001
From: rocky <rb@dustyfeet.com>
Date: Wed, 15 Nov 2017 21:04:06 -0500
Subject: [PATCH] Grammar cleanup: separate some 2.7 from 2.7- rules

---
 test/bytecode_2.6/02_while1else.pyc | Bin 0 -> 300 bytes
 uncompyle6/parsers/parse2.py        |  16 +++++++++++-----
 uncompyle6/parsers/parse27.py       |   3 +++
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 test/bytecode_2.6/02_while1else.pyc

diff --git a/test/bytecode_2.6/02_while1else.pyc b/test/bytecode_2.6/02_while1else.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..b31113bc3442bb9e2994ff25ffe19f628a579e44
GIT binary patch
literal 300
zcma(~I|{-;5S>j5HJHlE-XfJzYY`!R5N*UJNHXBU#>C79KVT!?!!vmmPvA@xY+aZ)
z!@l41<$L|dYn{UPDc*A)@)<IKJHUny1*^c}pHz4`WJf&IV>oq1aaC||;nvtb>R5|3
z;DN?%TYPP^tU@9y36~Ei0vZVDyfm0lQCBI3WOGa5Xp$Uv+Ta)s;jlbgkA(|eVq`S#
ktt+-R11MK@99PAGBrku>!ZkhrS4iG8FS6R;tSOL;Hw<MsS^xk5

literal 0
HcmV?d00001

diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py
index f05dd518..20b69f28 100644
--- a/uncompyle6/parsers/parse2.py
+++ b/uncompyle6/parsers/parse2.py
@@ -40,12 +40,10 @@ class Python2Parser(PythonParser):
 
     def p_stmt2(self, args):
         """
-        while1stmt     ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK COME_FROM
-        while1stmt     ::= SETUP_LOOP l_stmts     JUMP_BACK COME_FROM
-        while1stmt     ::= SETUP_LOOP l_stmts     JUMP_BACK POP_BLOCK COME_FROM
+        while1stmt     ::= SETUP_LOOP l_stmts JUMP_BACK COME_FROM
+        while1stmt     ::= SETUP_LOOP l_stmts JUMP_BACK POP_BLOCK COME_FROM
 
-        while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_BLOCK else_suite COME_FROM
-        while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK           else_suite COME_FROM
+        while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK else_suite COME_FROM
 
         exec_stmt ::= expr exprlist DUP_TOP EXEC_STMT
         exec_stmt ::= expr exprlist EXEC_STMT
@@ -396,10 +394,18 @@ class Python2Parser(PythonParser):
         self.check_reduce['augassign1'] = 'AST'
         self.check_reduce['augassign2'] = 'AST'
         self.check_reduce['_stmts'] = 'AST'
+
+        # Dead code testing...
+        # self.check_reduce['while1elsestmt'] = 'tokens'
         return
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         lhs = rule[0]
+
+        # Dead code testing...
+        # if lhs == 'while1elsestmt':
+        #     from trepan.api import debug; debug()
+
         if lhs in ('augassign1', 'augassign2') and ast[0] and ast[0][0] == 'and':
             return True
         elif lhs == '_stmts':
diff --git a/uncompyle6/parsers/parse27.py b/uncompyle6/parsers/parse27.py
index 85819711..6a30a953 100644
--- a/uncompyle6/parsers/parse27.py
+++ b/uncompyle6/parsers/parse27.py
@@ -108,6 +108,9 @@ class Python27Parser(Python2Parser):
 
         while1stmt ::= SETUP_LOOP return_stmts bp_come_from
         while1stmt ::= SETUP_LOOP return_stmts COME_FROM
+        while1elsestmt ::= SETUP_LOOP l_stmts JUMP_BACK POP_BLOCK else_suite COME_FROM
+        while1stmt     ::= SETUP_LOOP l_stmts_opt JUMP_BACK POP_BLOCK COME_FROM
+
         """
 
     def add_custom_rules(self, tokens, customize):