Yaltik/hy
2
0
Fork 0
Code Pull Requests Releases Activity

Clean up assignment handling code

Browse Source
This commit is contained in:
Ryan Gonzalez 2019-09-23 12:21:06 -05:00
parent 06213cd46c
commit 6eedb19a07
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hy/compiler.py
View File

@ -1336,15 +1336,17 @@ class HyASTCompiler(object):
@special("setv", [many(FORM + FORM)]) @special("setv", [many(FORM + FORM)])
@special((PY38, "setx"), [times(1, 1, SYM + FORM)]) @special((PY38, "setx"), [times(1, 1, SYM + FORM)])
def compile_def_expression(self, expr, root, pairs): def compile_def_expression(self, expr, root, decls):
if not pairs: if not decls:
return asty.Name(expr, id='None', ctx=ast.Load()) return asty.Name(expr, id='None', ctx=ast.Load())
result = Result() result = Result()
for pair in pairs: is_assignment_expr = root == HySymbol("setx")
result += self._compile_assign(root, *pair) for decl in decls:
result += self._compile_assign(*decl, is_assignment_expr=is_assignment_expr)
return result return result
def _compile_assign(self, root, name, result): def _compile_assign(self, name, result, *, is_assignment_expr=False):
if name in [HySymbol(x) for x in ("None", "True", "False")]: if name in [HySymbol(x) for x in ("None", "True", "False")]:
raise self._syntax_error(name, raise self._syntax_error(name,
@ -1361,13 +1363,13 @@ class HyASTCompiler(object):
and isinstance(name, HySymbol) and isinstance(name, HySymbol)
and '.' not in name): and '.' not in name):
result.rename(name) result.rename(name)
if root != HySymbol("setx"): if not is_assignment_expr:
# Throw away .expr to ensure that (setv ...) returns None. # Throw away .expr to ensure that (setv ...) returns None.
result.expr = None result.expr = None
else: else:
st_name = self._storeize(name, ld_name) st_name = self._storeize(name, ld_name)
node = (asty.NamedExpr node = (asty.NamedExpr
if root == HySymbol("setx") if is_assignment_expr
else asty.Assign) else asty.Assign)
result += node( result += node(
name if hasattr(name, "start_line") else result, name if hasattr(name, "start_line") else result,