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

Don't wrap values while expanding macros

Browse Source 
This is the compiler's job now.
This commit is contained in:
Kodi Arfer 2017-06-22 16:07:50 -07:00
parent 55986b2033
commit 6db3da779e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hy/macros.py
View File

@ -3,7 +3,7 @@
# license. See the LICENSE. # license. See the LICENSE.
from inspect import getargspec, formatargspec from inspect import getargspec, formatargspec
from hy.models import replace_hy_obj, wrap_value, HyExpression, HyString from hy.models import replace_hy_obj, HyExpression, HyString
from hy.errors import HyTypeError, HyMacroExpansionError from hy.errors import HyTypeError, HyMacroExpansionError
@ -196,7 +196,7 @@ def macroexpand_1(tree, compiler):
raise HyMacroExpansionError(tree, msg) raise HyMacroExpansionError(tree, msg)
try: try:
obj = wrap_value(m(*ntree[1:], **opts)) obj = m(*ntree[1:], **opts)
except HyTypeError as e: except HyTypeError as e:
if e.expression is None: if e.expression is None:
e.expression = tree e.expression = tree
@ -225,4 +225,4 @@ def tag_macroexpand(tag, tree, compiler):
) )
expr = tag_macro(tree) expr = tag_macro(tree)
return replace_hy_obj(wrap_value(expr), tree) return replace_hy_obj(expr, tree)