From 5a6e3ca31b6a23ed7297d3a191b575c6d184cd80 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Sun, 5 May 2013 15:33:52 +0200
Subject: [PATCH] Small code simplification

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 hy/compiler.py | 61 +++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git a/hy/compiler.py b/hy/compiler.py
index efe156b..7bc88f6 100644
--- a/hy/compiler.py
+++ b/hy/compiler.py
@@ -169,24 +169,24 @@ class Result(object):
 
         If there is no expression context, we return a "None" expression.
         """
-        if not self.expr:
-            # Spoof the position of the last statement for our generated None
-            lineno = 0
-            col_offset = 0
-            if self.stmts:
-                lineno = self.stmts[-1].lineno
-                col_offset = self.stmts[-1].col_offset
-
-            return ast.Name(id=ast_str("None"),
-                            arg=ast_str("None"),
-                            ctx=ast.Load(),
-                            lineno=lineno,
-                            col_offset=col_offset)
-            # XXX: Likely raise Exception here - this will assertionfail
-            #      pypy since the ast will be out of numerical order.
-        else:
+        if self.expr:
             return self.expr
 
+        # Spoof the position of the last statement for our generated None
+        lineno = 0
+        col_offset = 0
+        if self.stmts:
+            lineno = self.stmts[-1].lineno
+            col_offset = self.stmts[-1].col_offset
+
+        return ast.Name(id=ast_str("None"),
+                        arg=ast_str("None"),
+                        ctx=ast.Load(),
+                        lineno=lineno,
+                        col_offset=col_offset)
+        # XXX: Likely raise Exception here - this will assertionfail
+        #      pypy since the ast will be out of numerical order.
+
     def expr_as_stmt(self):
         """Convert the Result's expression context to a statement
 
@@ -257,20 +257,6 @@ class Result(object):
         )
 
 
-def _collect(results):
-    """Collect the expression contexts from a list of results
-
-    This returns a list of the expression contexts, and the sum of the Result
-    objects passed as arguments.
-    """
-    compiled_exprs = []
-    ret = Result()
-    for result in results:
-        ret += result
-        compiled_exprs.append(ret.force_expr)
-    return compiled_exprs, ret
-
-
 def _branch(results):
     """Make a branch out of a list of Result objects
 
@@ -363,8 +349,6 @@ class HyASTCompiler(object):
             if not isinstance(ret, Result):
                 ret = Result() + ret
             return ret
-        else:
-            return None
 
     def compile(self, tree):
         try:
@@ -384,7 +368,18 @@ class HyASTCompiler(object):
         raise HyCompileError(Exception("Unknown type: `%s'" % _type))
 
     def _compile_collect(self, exprs):
-        return _collect(self.compile(expr) for expr in exprs)
+        """Collect the expression contexts from a list of compiled expression.
+
+        This returns a list of the expression contexts, and the sum of the
+        Result objects passed as arguments.
+
+        """
+        compiled_exprs = []
+        ret = Result()
+        for expr in exprs:
+            ret += self.compile(expr)
+            compiled_exprs.append(ret.force_expr)
+        return compiled_exprs, ret
 
     def _compile_branch(self, exprs):
         return _branch(self.compile(expr) for expr in exprs)