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

Python 3.3 is more like 3.4 than we had thought?

Browse Source
This commit is contained in:
rocky
2016-06-19 03:22:06 -04:00
parent 305002e910
commit 2c22e86562
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/bytecode_3.3/05_set_comprehension.pyc Normal file
View File

Binary file not shown.

58
uncompyle6/parsers/parse3.py
View File

@@ -428,30 +428,6 @@ class Python3Parser(PythonParser):
Special handling for opcodes that take a variable number Special handling for opcodes that take a variable number
of arguments -- we add a new rule for each: of arguments -- we add a new rule for each:
Python 3.4+:
listcomp ::= LOAD_LISTCOMP LOAD_CONST MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
listcomp ::= {expr}^n LOAD_LISTCOMP MAKE_CLOSURE
GET_ITER CALL_FUNCTION_1
dictcomp ::= LOAD_DICTCOMP LOAD_CONST MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
Python < 3.4
listcomp ::= LOAD_LISTCOMP MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
setcomp ::= {expr}^n LOAD_SETCOMP MAKE_CLOSURE
GET_ITER CALL_FUNCTION_1
# build_class (see load_build_class)
build_list ::= {expr}^n BUILD_LIST_n
build_list ::= {expr}^n BUILD_TUPLE_n
load_closure ::= {LOAD_CLOSURE}^n BUILD_TUPLE_n
unpack_list ::= UNPACK_LIST_n {expr}^n unpack_list ::= UNPACK_LIST_n {expr}^n
unpack ::= UNPACK_TUPLE_n {expr}^n unpack ::= UNPACK_TUPLE_n {expr}^n
unpack ::= UNPACK_SEQEUENCE_n {expr}^n unpack ::= UNPACK_SEQEUENCE_n {expr}^n
@@ -464,10 +440,32 @@ class Python3Parser(PythonParser):
listcomp ::= load_closure expr GET_ITER CALL_FUNCTION_1 listcomp ::= load_closure expr GET_ITER CALL_FUNCTION_1
# build_class (see load_build_class)
build_list ::= {expr}^n BUILD_LIST_n
build_list ::= {expr}^n BUILD_TUPLE_n
load_closure ::= {LOAD_CLOSURE}^n BUILD_TUPLE_n
# call_function (see custom_classfunc_rule) # call_function (see custom_classfunc_rule)
Python 3.3+:
listcomp ::= LOAD_LISTCOMP LOAD_CONST MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
listcomp ::= {expr}^n LOAD_LISTCOMP MAKE_CLOSURE
GET_ITER CALL_FUNCTION_1
dictcomp ::= LOAD_DICTCOMP LOAD_CONST MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
Python < 3.3
listcomp ::= LOAD_LISTCOMP MAKE_FUNCTION_0 expr
GET_ITER CALL_FUNCTION_1
setcomp ::= {expr}^n LOAD_SETCOMP MAKE_CLOSURE
GET_ITER CALL_FUNCTION_1
""" """
# from trepan.api import debug
# debug(start_opts={'startup-profile': True})
for i, token in enumerate(tokens): for i, token in enumerate(tokens):
opname = token.type opname = token.type
opname_base = opname[:opname.rfind('_')] opname_base = opname[:opname.rfind('_')]
@@ -476,7 +474,7 @@ class Python3Parser(PythonParser):
'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'): 'CALL_FUNCTION_VAR_KW', 'CALL_FUNCTION_KW'):
self.custom_classfunc_rule(opname, token, customize) self.custom_classfunc_rule(opname, token, customize)
elif opname == 'LOAD_LISTCOMP': elif opname == 'LOAD_LISTCOMP':
if self.version >= 3.4: if self.version >= 3.3:
rule = ("listcomp ::= LOAD_LISTCOMP LOAD_CONST MAKE_FUNCTION_0 expr " rule = ("listcomp ::= LOAD_LISTCOMP LOAD_CONST MAKE_FUNCTION_0 expr "
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
else: else:
@@ -484,7 +482,7 @@ class Python3Parser(PythonParser):
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
elif opname == 'LOAD_DICTCOMP': elif opname == 'LOAD_DICTCOMP':
if self.version >= 3.4: if self.version >= 3.3:
rule = ("dictcomp ::= LOAD_DICTCOMP LOAD_CONST MAKE_FUNCTION_0 expr " rule = ("dictcomp ::= LOAD_DICTCOMP LOAD_CONST MAKE_FUNCTION_0 expr "
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
else: else:
@@ -492,7 +490,7 @@ class Python3Parser(PythonParser):
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
self.add_unique_rule(rule, opname, token.attr, customize) self.add_unique_rule(rule, opname, token.attr, customize)
elif opname == 'LOAD_SETCOMP': elif opname == 'LOAD_SETCOMP':
if self.version >= 3.4: if self.version >= 3.3:
rule = ("setcomp ::= LOAD_SETCOMP LOAD_CONST MAKE_FUNCTION_0 expr " rule = ("setcomp ::= LOAD_SETCOMP LOAD_CONST MAKE_FUNCTION_0 expr "
"GET_ITER CALL_FUNCTION_1") "GET_ITER CALL_FUNCTION_1")
else: else:
@@ -553,7 +551,7 @@ class Python3Parser(PythonParser):
'expr GET_ITER CALL_FUNCTION_1' % 'expr GET_ITER CALL_FUNCTION_1' %
('pos_arg ' * token.attr, opname), ('pos_arg ' * token.attr, opname),
opname, token.attr, customize) opname, token.attr, customize)
if self.version >= 3.4: if self.version >= 3.3:
self.add_unique_rule('listcomp ::= %sload_closure ' self.add_unique_rule('listcomp ::= %sload_closure '
'LOAD_LISTCOMP LOAD_CONST %s expr ' 'LOAD_LISTCOMP LOAD_CONST %s expr '
'GET_ITER CALL_FUNCTION_1' % 'GET_ITER CALL_FUNCTION_1' %