Adding in s'more testing.

hy/compiler/modfaker.py

@@ -7,15 +7,40 @@ def _add_native_methods(mod):
         def _print(*args, **kwargs):
             print " ".join([str(x) for x in args])
 
+
         def _plus(*args):
             ret = 0
             for x in args:
-                ret += int(x)
+                ret += x
+            return ret
+
+
+        def _subtract(*args):
+            ret = 0
+            for x in args:
+                ret -= x
+            return ret
+
+
+        def _mult(*args):
+            ret = 1
+            for x in args:
+                ret *= x
+            return ret
+
+
+        def _divide(*args):
+            ret = 1
+            for x in args:
+                ret /= x
             return ret
 
         natives = {
             "print": _print,
-            "+": _plus
+            "+": _plus,
+            "-": _subtract,
+            "*": _mult,
+            "/": _divide
         }
 
         for native in natives:

hy/lang/importer.py

@@ -0,0 +1,11 @@
+from hy.compiler.modfaker import forge_module
+from hy.lex.tokenize import tokenize
+
+
+def _hy_import_file(name, fd):
+    m = forge_module(
+        name,
+        fd,
+        tokenize(open(fd, 'r').read())
+    )
+    return m

hy/lang/symbol.py

@@ -6,4 +6,6 @@ class HYSymbol(unicode, HYObject):
         self += string
 
     def eval(self, *args, **kwargs):
+        if self.isdigit():
+            return float(self)
         return self.namespace[self]

test.hy

@@ -0,0 +1,6 @@
+; vim: tabstop=2 expandtab shiftwidth=2 softtabstop=2 filetype=lisp
+
+(def square (fn [x]
+     (* x x)))
+
+(print (square 2))

test.py

@@ -1,10 +1,4 @@
-from hy.compiler.modfaker import forge_module
+from hy.lang.importer import _hy_import_file
-from hy.lex.tokenize import tokenize
+import sys
-
-
-m = forge_module(
-    'test',
-    'test.hy',
-    tokenize('(def two (fn [x] (print x)))(two "Hello")')
-)
 
+mod = _hy_import_file('test', sys.argv[1])