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

ret_expr -> return_expr

Browse Source 
This matches Python's AST a little more closely
This commit is contained in:
rocky
2022-01-03 21:51:32 -05:00
parent 7f42694c25
commit deea74b6a8
20 changed files with 92 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uncompyle6/semantics/consts.py
View File

@@ -123,7 +123,7 @@ LINE_LENGTH = 80
RETURN_LOCALS = SyntaxTree(
"return",
[
SyntaxTree("ret_expr", [SyntaxTree("expr", [Token("LOAD_LOCALS")])]),
SyntaxTree("return_expr", [SyntaxTree("expr", [Token("LOAD_LOCALS")])]),
Token("RETURN_VALUE"),
],
)

2
uncompyle6/semantics/customize3.py
View File

@@ -96,7 +96,7 @@ def customize_for_version3(self, version):
ast = self.build_ast(code._tokens, code._customize, code)
self.customize(code._customize)
# skip over: sstmt, stmt, return, ret_expr
# skip over: sstmt, stmt, return, return_expr
# and other singleton derivations
while len(ast) == 1 or (
ast in ("sstmt", "return") and ast[-1] in ("RETURN_LAST", "RETURN_VALUE")

10
uncompyle6/semantics/fragments.py
View File

@@ -327,7 +327,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
start = len(self.f.getvalue()) + len(self.indent)
self.write(self.indent, "return")
if self.return_none or node != SyntaxTree(
"return", [SyntaxTree("ret_expr", [NONE]), Token("RETURN_VALUE")]
"return", [SyntaxTree("return_expr", [NONE]), Token("RETURN_VALUE")]
):
self.write(" ")
self.last_finish = len(self.f.getvalue())
@@ -355,7 +355,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
start = len(self.f.getvalue()) + len(self.indent)
self.write(self.indent, "return")
if self.return_none or node != SyntaxTree(
"return", [SyntaxTree("ret_expr", [NONE]), Token("RETURN_END_IF")]
"return", [SyntaxTree("return_expr", [NONE]), Token("RETURN_END_IF")]
):
self.write(" ")
self.preorder(node[0])
@@ -438,9 +438,9 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.set_pos_info(node, start, len(self.f.getvalue()))
self.prune()
def n_ret_expr(self, node):
def n_return_expr(self, node):
start = len(self.f.getvalue())
super(FragmentsWalker, self).n_ret_expr(node)
super(FragmentsWalker, self).n_return_expr(node)
self.set_pos_info(node, start, len(self.f.getvalue()))
def n_bin_op(self, node):
@@ -757,7 +757,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
if ast[0] == "sstmt":
ast = ast[0]
# skip over stmt return ret_expr
# skip over stmt return return_expr
ast = ast[0][0][0]
store = None
if ast in ["set_comp_func", "dict_comp_func"]:

10
uncompyle6/semantics/pysource.py
View File

@@ -475,7 +475,7 @@ class SourceWalker(GenericASTTraversal, object):
def is_return_none(self, node):
# Is there a better way?
ret = (
node[0] == "ret_expr"
node[0] == "return_expr"
and node[0][0] == "expr"
and node[0][0][0] == "LOAD_CONST"
and node[0][0][0].pattr is None
@@ -486,7 +486,7 @@ class SourceWalker(GenericASTTraversal, object):
# FIXME: should the SyntaxTree expression be folded into
# the global RETURN_NONE constant?
return ret or node == SyntaxTree(
"return", [SyntaxTree("ret_expr", [NONE]), Token("RETURN_VALUE")]
"return", [SyntaxTree("return_expr", [NONE]), Token("RETURN_VALUE")]
)
# Python 3.x can have be dead code as a result of its optimization?
@@ -598,7 +598,7 @@ class SourceWalker(GenericASTTraversal, object):
self.prec = p
self.prune()
def n_ret_expr(self, node):
def n_return_expr(self, node):
if len(node) == 1 and node[0] == "expr":
# If expr is yield we want parens.
self.prec = PRECEDENCE["yield"] - 1
@@ -606,7 +606,7 @@ class SourceWalker(GenericASTTraversal, object):
else:
self.n_expr(node)
n_ret_expr_or_cond = n_expr
n_return_expr_or_cond = n_expr
def n_bin_op(self, node):
"""bin_op (formerly "binary_expr") is the Python AST BinOp"""
@@ -1193,7 +1193,7 @@ class SourceWalker(GenericASTTraversal, object):
ast = self.build_ast(code._tokens, code._customize, code)
self.customize(code._customize)
# skip over: sstmt, stmt, return, ret_expr
# skip over: sstmt, stmt, return, return_expr
# and other singleton derivations
while len(ast) == 1 or (
ast in ("sstmt", "return") and ast[-1] in ("RETURN_LAST", "RETURN_VALUE")