jinx/python-uncompyle6
1
Fork 0
mirror of https://github.com/rocky/python-uncompyle6.git synced 2025-08-03 00:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge hell?

Browse Source
This commit is contained in:
rocky
2019-06-12 13:09:22 -04:00
parent 504164fcea
commit f3b72884c6
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
uncompyle6/parsers/parse3.py
View File

@@ -32,7 +32,6 @@ from uncompyle6.parser import PythonParser, PythonParserSingle, nop_func
from uncompyle6.parsers.treenode import SyntaxTree from uncompyle6.parsers.treenode import SyntaxTree
from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG from spark_parser import DEFAULT_DEBUG as PARSER_DEFAULT_DEBUG
from xdis import PYTHON3 from xdis import PYTHON3
from itertools import islice,chain,repeat
class Python3Parser(PythonParser): class Python3Parser(PythonParser):
@@ -1081,11 +1080,11 @@ class Python3Parser(PythonParser):
else: else:
# See above comment about use of EXTENDED_ARG # See above comment about use of EXTENDED_ARG
rule = ('mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CONST EXTENDED_ARG %s' % rule = ('mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CONST EXTENDED_ARG %s' %
(('kwargs ' * args_kw), ('pos_arg ' * (args_pos)), (('pos_arg ' * (args_pos)), ('kwargs ' * args_kw),
('annotate_arg ' * (annotate_args-1)), opname)) ('annotate_arg ' * (annotate_args-1)), opname))
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
rule = ('mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CONST EXTENDED_ARG %s' % rule = ('mkfunc_annotate ::= %s%s%sannotate_tuple LOAD_CONST EXTENDED_ARG %s' %
(('kwargs ' * args_kw), ('pos_arg ' * (args_pos)), (('pos_arg ' * (args_pos)), ('kwargs ' * args_kw),
('call ' * (annotate_args-1)), opname)) ('call ' * (annotate_args-1)), opname))
self.addRule(rule, nop_func) self.addRule(rule, nop_func)
elif opname == 'RETURN_VALUE_LAMBDA': elif opname == 'RETURN_VALUE_LAMBDA':
@@ -1220,10 +1219,11 @@ class Python3Parser(PythonParser):
cfl = last cfl = last
assert tokens[cfl] == 'COME_FROM_LOOP' assert tokens[cfl] == 'COME_FROM_LOOP'
if tokens[cfl-1] != 'JUMP_BACK': for i in range(cfl-1, first, -1):
cfl_offset = tokens[cfl-1].offset if tokens[i] != 'POP_BLOCK':
insn = chain((i for i in self.insts if cfl_offset == i.offset), repeat(None)).next() break
if insn and insn.is_jump_target: if tokens[i].kind not in ('JUMP_BACK', 'RETURN_VALUE'):
if not tokens[i].kind.startswith('COME_FROM'):
return True return True
# Check that the SETUP_LOOP jumps to the offset after the # Check that the SETUP_LOOP jumps to the offset after the