Towards fixing a 3.2 while true: ... break bug

rocky · rocky · commit 4d4e59c40bc6 · 2016-12-28T18:58:02.000-05:00
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
@@ -696,12 +696,19 @@ def add_custom_rules(self, tokens, customize):
         self.check_reduce['augassign1'] = 'AST'
         self.check_reduce['augassign2'] = 'AST'
         self.check_reduce['while1stmt'] = 'noAST'
+        # FIXME: remove parser errors caused by the below
+        # self.check_reduce['while1elsestmt'] = 'noAST'
         return
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         lhs = rule[0]
         if lhs in ('augassign1', 'augassign2') and ast[0][0] == 'and':
             return True
+        elif lhs == 'while1elsestmt':
+            last += 1
+            while isinstance(tokens[last], str):
+                last += 1
+            return tokens[first].attr != tokens[last].offset
         elif lhs == 'while1stmt':
             if tokens[last] in ('COME_FROM_LOOP', 'JUMP_BACK'):
                 # jump_back should be right afer SETUP_LOOP. Test?
diff --git a/uncompyle6/parsers/parse32.py b/uncompyle6/parsers/parse32.py
@@ -19,6 +19,11 @@ def p_32to35(self, args):
                               COME_FROM_LOOP
         whileTruestmt     ::= SETUP_LOOP return_stmts
                               COME_FROM_LOOP
+
+        # Python 3.2+ has more loop optimization that removes
+        # JUMP_FORWARD in some cases, and hence we also don't
+        # see COME_FROM
+        _ifstmts_jump ::= c_stmts_opt
         """
     pass
 
diff --git a/uncompyle6/parsers/parse33.py b/uncompyle6/parsers/parse33.py
@@ -21,11 +21,6 @@ def p_33on(self, args):
         iflaststmt    ::= testexpr c_stmts_opt33
         c_stmts_opt33 ::= JUMP_BACK JUMP_ABSOLUTE c_stmts_opt
         _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD _come_from
-
-        # Python 3.3+ has more loop optimization that removes
-        # JUMP_FORWARD in some cases, and hence we also don't
-        # see COME_FROM
-        _ifstmts_jump ::= c_stmts_opt
         """
 
 class Python33ParserSingle(Python33Parser, PythonParserSingle):
