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

compiler: optimize empty tree mangling to ast.Pass

Browse Source 
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2013-04-08 19:22:30 +02:00 committed by Paul Tagliamonte
parent 3dabc1a72a
commit d7e8dd2a91
2 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
hy/compiler.py
View File

@ -120,7 +120,12 @@ class HyASTCompiler(object):
raise HyCompileError("Unknown type - `%s'" % (str(type(tree)))) raise HyCompileError("Unknown type - `%s'" % (str(type(tree))))
def _mangle_branch(self, tree): def _mangle_branch(self, tree, start_line, start_column):
# If tree is empty, just return a pass statement
if tree == []:
return [ast.Pass(lineno=start_line,
col_offset=start_column)]
ret = [] ret = []
tree = list(flatten_literal_list(tree)) tree = list(flatten_literal_list(tree))
tree.reverse() tree.reverse()
@ -184,13 +189,15 @@ class HyASTCompiler(object):
else: else:
Try = ast.TryExcept Try = ast.TryExcept
if len(expr) == 0: try:
# (try) body = expr.pop(0)
body = [ast.Pass(lineno=expr.start_line, except IndexError:
col_offset=expr.start_column)] body = []
else:
# (try something…) # (try something…)
body = self._code_branch(self.compile(expr.pop(0))) body = self._code_branch(self.compile(body),
expr.start_line,
expr.start_column)
if len(expr) == 0: if len(expr) == 0:
# (try) or (try body) # (try) or (try body)
@ -273,12 +280,9 @@ class HyASTCompiler(object):
else: else:
raise TypeError("`catch' needs a valid exception list to catch") raise TypeError("`catch' needs a valid exception list to catch")
if len(expr) == 0: body = self._code_branch([self.compile(x) for x in expr],
# No body expr.start_line,
body = [ast.Pass(lineno=expr.start_line, expr.start_column)
col_offset=expr.start_column)]
else:
body = self._code_branch([self.compile(x) for x in expr])
return ast.ExceptHandler( return ast.ExceptHandler(
lineno=expr.start_line, lineno=expr.start_line,
@ -287,20 +291,26 @@ class HyASTCompiler(object):
name=name, name=name,
body=body) body=body)
def _code_branch(self, branch): def _code_branch(self, branch, start_line, start_column):
if isinstance(branch, list): return self._mangle_branch((branch
return self._mangle_branch(branch) if isinstance(branch, list)
return self._mangle_branch([branch]) else [branch]),
start_line,
start_column)
@builds("if") @builds("if")
@checkargs(min=2, max=3) @checkargs(min=2, max=3)
def compile_if_expression(self, expr): def compile_if_expression(self, expr):
expr.pop(0) # if expr.pop(0) # if
test = self.compile(expr.pop(0)) test = self.compile(expr.pop(0))
body = self._code_branch(self.compile(expr.pop(0))) body = self._code_branch(self.compile(expr.pop(0)),
expr.start_line,
expr.start_column)
if len(expr) == 1: if len(expr) == 1:
orel = self._code_branch(self.compile(expr.pop(0))) orel = self._code_branch(self.compile(expr.pop(0)),
expr.start_line,
expr.start_column)
else: else:
orel = [] orel = []
@ -495,8 +505,10 @@ class HyASTCompiler(object):
lineno=expr.start_line, lineno=expr.start_line,
col_offset=expr.start_column, col_offset=expr.start_column,
optional_vars=thing, optional_vars=thing,
body=self._mangle_branch([ body=self._code_branch(
self.compile(x) for x in expr])) [self.compile(x) for x in expr],
expr.start_line,
expr.start_column))
if sys.version_info[0] >= 3 and sys.version_info[1] >= 3: if sys.version_info[0] >= 3 and sys.version_info[1] >= 3:
ret.items = [ast.withitem(context_expr=ctx, optional_vars=thing)] ret.items = [ast.withitem(context_expr=ctx, optional_vars=thing)]
@ -727,8 +739,10 @@ class HyASTCompiler(object):
col_offset=expression.start_column, col_offset=expression.start_column,
target=target, target=target,
iter=self.compile(iterable), iter=self.compile(iterable),
body=self._mangle_branch([ body=self._code_branch(
self.compile(x) for x in expression]), [self.compile(x) for x in expression],
expression.start_line,
expression.start_column),
orelse=[]) orelse=[])
self.returnable = ret_status self.returnable = ret_status
@ -741,8 +755,10 @@ class HyASTCompiler(object):
test = self.compile(expr.pop(0)) test = self.compile(expr.pop(0))
return ast.While(test=test, return ast.While(test=test,
body=self._mangle_branch([ body=self._code_branch(
self.compile(x) for x in expr]), [self.compile(x) for x in expr],
expr.start_line,
expr.start_column),
orelse=[], orelse=[],
lineno=expr.start_line, lineno=expr.start_line,
col_offset=expr.start_column) col_offset=expr.start_column)
@ -775,12 +791,10 @@ class HyASTCompiler(object):
body.append(self.compile(el)) body.append(self.compile(el))
body.append(tailop) body.append(tailop)
if body == []:
body = [ast.Pass(lineno=expression.start_line,
col_offset=expression.start_column)]
self.returnable = True self.returnable = True
body = self._code_branch(body) body = self._code_branch(body,
expression.start_line,
expression.start_column)
ret = ast.FunctionDef( ret = ast.FunctionDef(
name=name, name=name,
@ -858,5 +872,5 @@ def hy_compile(tree, root=None):
tlo = root tlo = root
if root is None: if root is None:
tlo = ast.Module tlo = ast.Module
ret = tlo(body=compiler._mangle_branch(compiler.compile(tree))) ret = tlo(body=compiler._mangle_branch(compiler.compile(tree), 0, 0))
return ret return ret

7
tests/native_tests/language.hy
View File

@ -160,11 +160,18 @@
(assert (= (.join " " ["one" "two"]) "one two"))) (assert (= (.join " " ["one" "two"]) "one two")))
(defn test-do []
"NATIVE: test do"
(do))
(defn test-exceptions [] (defn test-exceptions []
"NATIVE: test Exceptions" "NATIVE: test Exceptions"
(try) (try)
(try (do))
(try (pass)) (try (pass))
(try (pass) (except)) (try (pass) (except))