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

Sync with 3.3-3.5 branch

Browse Source
This commit is contained in:
rocky
2022-11-04 00:48:53 -04:00
parent d0a98bdbc6
commit 0be3fc657b
1 changed files with 29 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
uncompyle6/semantics/gencomp.py
View File

@@ -27,6 +27,7 @@ from uncompyle6.semantics.consts import PRECEDENCE
from uncompyle6.semantics.helper import is_lambda_mode from uncompyle6.semantics.helper import is_lambda_mode
from uncompyle6.scanners.tok import Token from uncompyle6.scanners.tok import Token
class ComprehensionMixin: class ComprehensionMixin:
""" """
These functions hand nonterminal common actions that occur These functions hand nonterminal common actions that occur
@@ -37,12 +38,13 @@ class ComprehensionMixin:
Python source code. In source code, the implicit function calls Python source code. In source code, the implicit function calls
are not seen. are not seen.
""" """
def closure_walk(self, node, collection_index): def closure_walk(self, node, collection_index):
""" """
Dictionary and comprehensions using closure the way they are done in Python3. Dictionary and comprehensions using closure the way they are done in Python3.
""" """
p = self.prec p = self.prec
self.prec = 27 self.prec = PRECEDENCE["lambda_body"] - 1
code_index = 0 if node[0] == "load_genexpr" else 1 code_index = 0 if node[0] == "load_genexpr" else 1
tree = self.get_comprehension_function(node, code_index=code_index) tree = self.get_comprehension_function(node, code_index=code_index)
@@ -114,7 +116,10 @@ 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 ("generator_exp", "generator_exp_async"): elif self.version >= (3, 0) and node in (
"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":
@@ -143,7 +148,9 @@ 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, compile_mode="exec", is_pypy=self.is_pypy, self.version,
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
@@ -398,8 +405,11 @@ class ComprehensionMixin:
if n in ("list_for", "comp_for"): if n in ("list_for", "comp_for"):
n_index = 3 n_index = 3
if ((n[2] == "store") if (
or (self.version == (3, 0) and n[4] == "store") and not store): (n[2] == "store")
or (self.version == (3, 0) and n[4] == "store")
and not store
):
if self.version == (3, 0): if self.version == (3, 0):
store = n[4] store = n[4]
n_index = 5 n_index = 5
@@ -408,9 +418,14 @@ class ComprehensionMixin:
if not comp_store: if not comp_store:
comp_store = store comp_store = store
n = n[n_index] n = n[n_index]
elif n in ("list_if", "list_if_not", elif n in (
"list_if37", "list_if37_not", "list_if",
"comp_if", "comp_if_not"): "list_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]
@@ -492,7 +507,7 @@ class ComprehensionMixin:
if have_not: if have_not:
self.write("not ") self.write("not ")
pass pass
self.prec = 27 self.prec = PRECEDENCE["lambda_body"] - 1
self.preorder(if_node) self.preorder(if_node)
pass pass
self.prec = p self.prec = p
@@ -503,7 +518,7 @@ class ComprehensionMixin:
find the comprehension node buried in the tree which may find the comprehension node buried in the tree which may
be surrounded with start-like symbols or dominiators,. be surrounded with start-like symbols or dominiators,.
""" """
self.prec = 27 self.prec = PRECEDENCE["lambda_body"] - 1
code_node = node[code_index] code_node = node[code_index]
if code_node == "load_genexpr": if code_node == "load_genexpr":
code_node = code_node[0] code_node = code_node[0]
@@ -519,7 +534,9 @@ 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, compile_mode="exec", is_pypy=self.is_pypy, self.version,
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
@@ -538,9 +555,7 @@ class ComprehensionMixin:
if tree[0] in ("dom_start", "dom_start_opt"): if tree[0] in ("dom_start", "dom_start_opt"):
tree = tree[1] tree = tree[1]
while len(tree) == 1 or ( while len(tree) == 1 or (tree in ("stmt", "sstmt", "return", "return_expr")):
tree in ("stmt", "sstmt", "return", "return_expr")
):
self.prec = 100 self.prec = 100
tree = tree[1] if tree[0] in ("dom_start", "dom_start_opt") else tree[0] tree = tree[1] if tree[0] in ("dom_start", "dom_start_opt") else tree[0]
return tree return tree