Python 2.6 grammary bug and..

rocky · rocky · commit cbcfd53dae52 · 2016-11-23T21:44:53.000-05:00
__pkginfo.py__: Bump spark_parser version for parse_flags 'dups'
diff --git a/__pkginfo__.py b/__pkginfo__.py
@@ -37,7 +37,7 @@
         'pydisassemble=uncompyle6.bin.pydisassemble:main',
     ]}
 ftp_url            = None
-install_requires   = ['spark-parser >= 1.4.0, < 1.5.0',
+install_requires   = ['spark-parser >= 1.4.3, < 1.5.0',
                       'xdis >= 3.2.3, < 3.3.0']
 license            = 'MIT'
 mailing_list       = 'python-debugger@googlegroups.com'
diff --git a/pytest/test_grammar.py b/pytest/test_grammar.py
@@ -59,5 +59,5 @@ def test_dup_rule():
     python_parser(PYTHON_VERSION, inspect.currentframe().f_code,
                   is_pypy=IS_PYPY,
                   parser_debug={
-                      'rules': True, 'transition': False, 'reduce': False,
-                      'errorstack': None, 'context': True})
+                      'dups': True, 'transition': False, 'reduce': False,
+                      'rules': False, 'errorstack': None, 'context': True})
diff --git a/uncompyle6/parser.py b/uncompyle6/parser.py
@@ -709,8 +709,8 @@ def python_parser(version, co, out=sys.stdout, showasm=False,
     maybe_show_asm(showasm, tokens)
 
     # For heavy grammar debugging
-    parser_debug = {'rules': True, 'transition': True, 'reduce' : True,
-                    'showstack': 'full'}
+    # parser_debug = {'rules': True, 'transition': True, 'reduce' : True,
+    #                 'showstack': 'full'}
     p = get_python_parser(version, parser_debug)
     return parse(p, tokens, customize)
 
diff --git a/uncompyle6/parsers/parse26.py b/uncompyle6/parsers/parse26.py
@@ -84,6 +84,7 @@ def p_jumps26(self, args):
         jb_cont      ::= CONTINUE
 
         jb_cf_pop ::= JUMP_BACK come_froms POP_TOP
+        jb_cf_pop ::= JUMP_BACK POP_TOP
         ja_cf_pop ::= JUMP_ABSOLUTE come_froms POP_TOP
         jf_cf_pop ::= JUMP_FORWARD come_froms POP_TOP
 
@@ -188,6 +189,8 @@ def p_comp26(self, args):
 
         comp_body ::= gen_comp_body
 
+        for_block ::= l_stmts_opt _come_from POP_TOP JUMP_BACK
+
         # Make sure we keep indices the same as 2.7
         setup_loop_lf ::= SETUP_LOOP LOAD_FAST
         genexpr_func ::= setup_loop_lf FOR_ITER designator comp_iter jb_bp_come_from
