Reorganize parse2.py to remove useless rule in 2.7

rocky · rocky · commit 697456763980 · 2017-01-27T07:21:09.000-05:00
diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
@@ -39,7 +39,7 @@ def check_tokens(tokens, opcode_set):
     s = get_scanner(PYTHON_VERSION, IS_PYPY)
     ignore_set = set(
             """
-            JUMP_BACK CONTINUE RETURN_END_IF
+            JUMP_BACK CONTINUE RETURN_END_IF THEN
             COME_FROM COME_FROM_EXCEPT COME_FROM_LOOP COME_FROM_WITH
             COME_FROM_FINALLY ELSE
             LOAD_GENEXPR LOAD_ASSERT LOAD_SETCOMP LOAD_DICTCOMP
diff --git a/uncompyle6/parsers/parse2.py b/uncompyle6/parsers/parse2.py
@@ -136,17 +136,12 @@ def p_grammar(self, args):
 
         _ifstmts_jump ::= return_if_stmts
 
-        iflaststmt ::= testexpr c_stmts_opt JUMP_ABSOLUTE
-
+        iflaststmt  ::= testexpr c_stmts_opt JUMP_ABSOLUTE
         iflaststmtl ::= testexpr c_stmts_opt JUMP_BACK
-
-        ifelsestmt ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM
-        ifelsestmt ::= testexpr_then c_stmts_opt jf_cf_pop else_suite come_froms
-
+        ifelsestmt  ::= testexpr c_stmts_opt JUMP_FORWARD else_suite COME_FROM
         ifelsestmtc ::= testexpr c_stmts_opt JUMP_ABSOLUTE else_suitec
 
         ifelsestmtr ::= testexpr return_if_stmts return_stmts
-
         ifelsestmtr ::= testexpr return_if_stmts COME_FROM return_stmts
 
         ifelsestmtl ::= testexpr c_stmts_opt JUMP_BACK else_suitel
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
@@ -113,6 +113,8 @@ def p_stmt26(self, args):
 
         break_stmt ::= BREAK_LOOP JUMP_BACK
 
+        ifelsestmt ::= testexpr_then c_stmts_opt jf_cf_pop else_suite come_froms
+
         # Semantic actions want else_suitel to be at index 3
         ifelsestmtl ::= testexpr c_stmts_opt jb_cf_pop else_suitel
         ifelsestmtc ::= testexpr c_stmts_opt ja_cf_pop else_suitec
