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

adjust calling bits to allow ((foo))

Browse Source
This commit is contained in:
Paul R. Tagliamonte 2013-03-09 16:42:07 -05:00
parent 276df1b103
commit ccfcefe207
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hy/compiler.py
View File

@ -214,10 +214,11 @@ class HyASTCompiler(object):
@builds(HyExpression) @builds(HyExpression)
def compile_expression(self, expression): def compile_expression(self, expression):
fn = expression[0] fn = expression[0]
if fn in _compile_table: if isinstance(fn, HyString):
return _compile_table[fn](self, expression) if fn in _compile_table:
return _compile_table[fn](self, expression)
return ast.Call(func=self.compile_symbol(fn), return ast.Call(func=self.compile(fn),
args=[self.compile(x) for x in expression[1:]], args=[self.compile(x) for x in expression[1:]],
keywords=[], keywords=[],
starargs=None, starargs=None,

12
hy/macros.py
View File

@ -19,6 +19,7 @@
# DEALINGS IN THE SOFTWARE. # DEALINGS IN THE SOFTWARE.
from hy.models.expression import HyExpression from hy.models.expression import HyExpression
from hy.models.string import HyString
from hy.models.list import HyList from hy.models.list import HyList
_hy_macros = {} _hy_macros = {}
@ -36,11 +37,12 @@ def process(tree):
fn = tree[0] fn = tree[0]
ntree = HyExpression([fn] + [process(x) for x in tree[1:]]) ntree = HyExpression([fn] + [process(x) for x in tree[1:]])
if fn in _hy_macros: if isinstance(fn, HyString):
m = _hy_macros[fn] if fn in _hy_macros:
obj = m(ntree) m = _hy_macros[fn]
obj.replace(tree) obj = m(ntree)
return obj obj.replace(tree)
return obj
ntree.replace(tree) ntree.replace(tree)
return ntree return ntree