Some Python 3.4 bugss fixed by using 3.5 rules

rocky · rocky · commit 493e4b14a1cb · 2017-02-20T08:17:17.000-05:00
diff --git a/uncompyle6/parsers/parse3.py b/uncompyle6/parsers/parse3.py
@@ -141,6 +141,7 @@ def p_grammar(self, args):
 
         _ifstmts_jump ::= return_if_stmts
         _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD COME_FROM
+        _ifstmts_jump ::= c_stmts_opt COME_FROM
 
         iflaststmt ::= testexpr c_stmts_opt JUMP_ABSOLUTE
 
diff --git a/uncompyle6/parsers/parse35.py b/uncompyle6/parsers/parse35.py
@@ -110,7 +110,6 @@ def p_35on(self, args):
 
         yield_from ::= expr GET_YIELD_FROM_ITER LOAD_CONST YIELD_FROM
 
-        _ifstmts_jump ::= c_stmts_opt COME_FROM
         """
 
     def add_custom_rules(self, tokens, customize):
diff --git a/uncompyle6/scanners/scanner3.py b/uncompyle6/scanners/scanner3.py
@@ -331,7 +331,7 @@ def ingest(self, co, classname=None, code_objects={}, show_asm=None):
                         (next_opname not in ('END_FINALLY', 'POP_BLOCK',
                                             # Python 3.0 only uses POP_TOP
                                             'POP_TOP'))):
-                        if (self.version >= 3.5 or
+                        if (self.version >= 3.4 or
                             (inst.offset not in self.not_continue) or
                             (tokens[-1].type == 'RETURN_VALUE')):
                             opname = 'CONTINUE'
@@ -897,8 +897,6 @@ def detect_control_flow(self, offset, targets):
                 # For now, we'll only tag forward jump.
                 if rtarget > offset:
                     self.fixed_jumps[offset] = rtarget
-                    self.not_continue.add(pre_rtarget)
-
 
         elif op == self.opc.SETUP_EXCEPT:
             target = self.get_target(offset)
