From d25d3542815136df9ee835e83670efda0fe9b432 Mon Sep 17 00:00:00 2001
From: "Paul R. Tagliamonte" <paultag@debian.org>
Date: Wed, 10 Apr 2013 22:51:58 -0400
Subject: [PATCH] Adding in on-the-fly-importing.

---
 hy/compiler.py                 | 22 ++++++++++++++++++++++
 tests/native_tests/language.hy |  2 --
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/hy/compiler.py b/hy/compiler.py
index 977091c..dada940 100644
--- a/hy/compiler.py
+++ b/hy/compiler.py
@@ -32,6 +32,7 @@ from hy.models.dict import HyDict
 
 from hy.util import flatten_literal_list
 
+from collections import defaultdict
 import codecs
 import ast
 import sys
@@ -117,6 +118,7 @@ class HyASTCompiler(object):
     def __init__(self):
         self.returnable = False
         self.anon_fn_count = 0
+        self.imports = defaultdict(list)
 
     def compile(self, tree):
         try:
@@ -181,6 +183,8 @@ class HyASTCompiler(object):
 
     def _render_quoted_form(self, form):
         name = form.__class__.__name__
+        self.imports["hy"].append((name, form))
+
         if isinstance(form, HyList):
             return HyExpression(
                 [HySymbol(name),
@@ -199,6 +203,8 @@ class HyASTCompiler(object):
     @checkargs(exact=1)
     def compile_eval(self, expr):
         expr.pop(0)
+        self.imports["hy.importer"].append(("hy_eval", expr))
+
         return self.compile(HyExpression([
             HySymbol("hy_eval")] + expr + [
                 HyExpression([HySymbol("locals")])]).replace(expr))
@@ -945,5 +951,21 @@ def hy_compile(tree, root=None):
     if type(_ast) == list:
         _ast = compiler._mangle_branch(_ast, 0, 0)
 
+        imports = []
+        for package in compiler.imports:
+            imported = set()
+            syms = compiler.imports[package]
+            for entry, form in syms:
+                if entry in imported:
+                    continue
+
+                imported.add(entry)
+                imports.append(HyExpression([
+                    HySymbol("import_from"),
+                    HySymbol(package),
+                    HySymbol(entry)
+                ]).replace(form))
+        _ast = compiler.compile(imports) + _ast
+
     ret = tlo(body=_ast)
     return ret
diff --git a/tests/native_tests/language.hy b/tests/native_tests/language.hy
index 6b1f380..018cbc3 100644
--- a/tests/native_tests/language.hy
+++ b/tests/native_tests/language.hy
@@ -513,8 +513,6 @@
 
 (defn test-eval []
   "NATIVE: test eval"
-  (import-from hy.importer hy-eval)  ; XXX: Fix this!!!!!
-  (import-from hy HyExpression HyInteger HySymbol HyString)
   (assert (= 2 (eval (quote (+ 1 1)))))
   (setf x 2)
   (assert (= 4 (eval (quote (+ x 2)))))