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

Merge branch 'master' into python-3.3-to-3.5

Browse Source
This commit is contained in:
rocky
2022-11-04 00:47:00 -04:00
parent 0ce23288cb d0a98bdbc6
commit 375101d960
2 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
uncompyle6/parsers/parse30.py
View File

@@ -85,6 +85,11 @@ class Python30Parser(Python31Parser):
LOAD_FAST FOR_ITER store comp_iter LOAD_FAST FOR_ITER store comp_iter
JUMP_BACK _come_froms POP_TOP JUMP_BACK JUMP_BACK _come_froms POP_TOP JUMP_BACK
list_for ::= DUP_TOP STORE_FAST
expr_or_arg
FOR_ITER
store list_iter jb_or_c
set_comp ::= set_comp_header set_comp ::= set_comp_header
LOAD_FAST FOR_ITER store comp_iter LOAD_FAST FOR_ITER store comp_iter
JUMP_BACK JUMP_BACK
@@ -219,7 +224,7 @@ class Python30Parser(Python31Parser):
# lc_body ::= LOAD_NAME expr LIST_APPEND # lc_body ::= LOAD_NAME expr LIST_APPEND
# lc_body ::= expr LIST_APPEND # lc_body ::= expr LIST_APPEND
# list_comp ::= BUILD_LIST_0 list_iter # list_comp ::= BUILD_LIST_0 list_iter
# list_for ::= expr FOR_ITER store list_iter jb_or_c list_for ::= expr FOR_ITER store list_iter jb_or_c
# list_if ::= expr jmp_false list_iter # list_if ::= expr jmp_false list_iter
# list_if ::= expr jmp_false_then list_iter # list_if ::= expr jmp_false_then list_iter
# list_if_not ::= expr jmp_true list_iter # list_if_not ::= expr jmp_true list_iter

45
uncompyle6/semantics/gencomp.py
View File

@@ -113,10 +113,7 @@ class ComprehensionMixin:
elif node[0] == "load_closure": elif node[0] == "load_closure":
cn = node[1] cn = node[1]
elif self.version >= (3, 0) and node in ( elif self.version >= (3, 0) and node in ("generator_exp", "generator_exp_async"):
"generator_exp",
"generator_exp_async",
):
if node[0] == "load_genexpr": if node[0] == "load_genexpr":
load_genexpr = node[0] load_genexpr = node[0]
elif node[1] == "load_genexpr": elif node[1] == "load_genexpr":
@@ -145,9 +142,7 @@ class ComprehensionMixin:
if is_lambda_mode(self.compile_mode): if is_lambda_mode(self.compile_mode):
p_save = self.p p_save = self.p
self.p = get_python_parser( self.p = get_python_parser(
self.version, self.version, compile_mode="exec", is_pypy=self.is_pypy,
compile_mode="exec",
is_pypy=self.is_pypy,
) )
tree = self.build_ast(code._tokens, code._customize, code) tree = self.build_ast(code._tokens, code._customize, code)
self.p = p_save self.p = p_save
@@ -388,7 +383,7 @@ class ComprehensionMixin:
while n in ("list_iter", "list_afor", "list_afor2", "comp_iter"): while n in ("list_iter", "list_afor", "list_afor2", "comp_iter"):
# iterate one nesting deeper # iterate one nesting deeper
if self.version == 3.0 and len(n) == 3: if self.version == (3, 0) and len(n) == 3:
assert n[0] == "expr" and n[1] == "expr" assert n[0] == "expr" and n[1] == "expr"
n = n[1] n = n[1]
elif n == "list_afor": elif n == "list_afor":
@@ -401,19 +396,20 @@ class ComprehensionMixin:
n = n[0] n = n[0]
if n in ("list_for", "comp_for"): if n in ("list_for", "comp_for"):
if n[2] == "store" and not store: n_index = 3
store = n[2] if ((n[2] == "store")
or (self.version == (3, 0) and n[4] == "store") and not store):
if self.version == (3, 0):
store = n[4]
n_index = 5
else:
store = n[2]
if not comp_store: if not comp_store:
comp_store = store comp_store = store
n = n[3] n = n[n_index]
elif n in ( elif n in ("list_if", "list_if_not",
"list_if", "list_if37", "list_if37_not",
"list_if_not", "comp_if", "comp_if_not"):
"list_if37",
"list_if37_not",
"comp_if",
"comp_if_not",
):
have_not = n in ("list_if_not", "comp_if_not", "list_if37_not") have_not = n in ("list_if_not", "comp_if_not", "list_if37_not")
if n in ("list_if37", "list_if37_not"): if n in ("list_if37", "list_if37_not"):
n = n[1] n = n[1]
@@ -452,7 +448,11 @@ class ComprehensionMixin:
self.write(": ") self.write(": ")
self.preorder(n[1]) self.preorder(n[1])
else: else:
self.preorder(n[0]) if self.version == (3, 0):
body = n[1]
else:
body = n[0]
self.preorder(body)
if node == "list_comp_async": if node == "list_comp_async":
self.write(" async") self.write(" async")
@@ -464,6 +464,7 @@ class ComprehensionMixin:
if comp_store: if comp_store:
self.preorder(comp_store) self.preorder(comp_store)
comp_store = None
else: else:
self.preorder(store) self.preorder(store)
@@ -517,9 +518,7 @@ class ComprehensionMixin:
if self.compile_mode in ("listcomp",): # add other comprehensions to this list if self.compile_mode in ("listcomp",): # add other comprehensions to this list
p_save = self.p p_save = self.p
self.p = get_python_parser( self.p = get_python_parser(
self.version, self.version, compile_mode="exec", is_pypy=self.is_pypy,
compile_mode="exec",
is_pypy=self.is_pypy,
) )
tree = self.build_ast( tree = self.build_ast(
code._tokens, code._customize, code, is_lambda=self.is_lambda code._tokens, code._customize, code, is_lambda=self.is_lambda