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

futzing with condlike things.

Browse Source
This commit is contained in:
Paul R. Tagliamonte 2013-03-09 00:17:02 -05:00
parent ce3e7a2d37
commit ab2cf5beda
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hy/compiler.py
View File

@ -94,10 +94,15 @@ class HyASTCompiler(object):
@builds("if") @builds("if")
def compile_if_expression(self, expr): def compile_if_expression(self, expr):
expr.pop(0) expr.pop(0)
test = self.compile(expr.pop(0))
body = self._code_branch(self.compile(expr.pop(0)))
orel = []
if len(expr) > 0:
orel = self._code_branch(self.compile(expr.pop(0)))
return ast.If(test=self.compile(expr.pop(0)), return ast.If(test=test,
body=self._code_branch(self.compile(expr.pop(0))), body=body,
orelse=self._code_branch(self.compile(expr.pop(0))), orelse=orel,
lineno=expr.start_line, lineno=expr.start_line,
col_offset=expr.start_column) col_offset=expr.start_column)

17
hy/core/bootstrap.py
View File

@ -28,3 +28,20 @@ from hy.models.symbol import HySymbol
def defn_macro(tree): def defn_macro(tree):
return HyExpression([HySymbol("def"), return HyExpression([HySymbol("def"),
tree[1], HyExpression([HySymbol("fn")] + tree[2:])]) tree[1], HyExpression([HySymbol("fn")] + tree[2:])])
@macro("cond")
def cond_macro(tree):
tree.pop(0) # cond flag
it = iter(tree)
conds = iter(zip(it, it))
test, branch = next(conds)
root = HyExpression([HySymbol("if"), test, branch])
ret = root
for (test, branch) in conds:
n = HyExpression([HySymbol("if"), test, branch])
ret.append(n)
ret = n
return root