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

Merge branch 'olasd:feature/only-macroexpand-when-needed'

Browse Source
This commit is contained in:
Abhishek L 2013-12-27 11:50:39 +05:30
commit 141f44c09f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hy/compiler.py
View File

@ -420,7 +420,6 @@ class HyASTCompiler(object):
def compile(self, tree): def compile(self, tree):
try: try:
tree = macroexpand(tree, self.module_name)
_type = type(tree) _type = type(tree)
ret = self.compile_atom(_type, tree) ret = self.compile_atom(_type, tree)
if ret: if ret:
@ -1497,6 +1496,13 @@ class HyASTCompiler(object):
def compile_expression(self, expression): def compile_expression(self, expression):
if expression == []: if expression == []:
return self.compile_list(expression) return self.compile_list(expression)
# Perform macro expansions
expression = macroexpand(expression, self.module_name)
if not isinstance(expression, HyExpression):
# Go through compile again if the type changed.
return self.compile(expression)
fn = expression[0] fn = expression[0]
func = None func = None
if isinstance(fn, HyKeyword): if isinstance(fn, HyKeyword):