Change names and hoist eval

read is unimplemented and load is buggy

3 files changed, 30 insertions, 7 deletions

@@ -16,7 +16,12 @@ local function fold (kons, knil, r)
         end
 end
 
-local env = {}
+local env = type.environment({}, {})
+
+env["interaction-environment"] = function (r)
+        assert_arity(r,0,0)
+        return env
+end
 
 ---[[ EQUIVALENCE ]]---
 
@@ -6,7 +6,7 @@ local assert_arity = type.assert_arity
 local util = require("util")
 local error = util.error
 
-m.special_forms = {
+m.primitives = {
         quote =
                 function (r, _)
                         assert_arity(r,1,1)
@@ -89,8 +89,8 @@ function m.eval (x, env)
                 return x
         else
                 local op, args = x[1], x[2]
-                if m.special_forms[op] then
-                        return m.special_forms[op](args, env)
+                if m.primitives[op] then
+                        return m.primitives[op](args, env)
                 else -- procedure application
                         local fn = m.eval(op, env)
                         local params = {}
@@ -15,9 +15,21 @@ local function schemeprint (x)
         end
 end
 
-local function handle_error (e)
-        local start = e:find(": ")
-        return e:sub(start + 2)
+function core.environment.read (r)
+        type.assert_arity(r,1,1)
+        error("unimplemented")
+end
+
+function core.environment.eval (r)
+        type.assert_arity(r,1,2)
+        local form = r[1]
+        local env = r[2][1] or core.environment
+        return eval.eval(form, env)
+end
+
+function core.environment.load (r)
+        type.assert_arity(r,1,1)
+        return m.load(tostring(r[1]))
 end
 
 function m.load (filename, interactive)
@@ -29,6 +41,12 @@ function m.load (filename, interactive)
         else
                 io.output():setvbuf("no")
         end
+
+        local function handle_error (e)
+                local start = e:find(": ")
+                return e:sub(start + 2)
+        end
+
         repeat
                 if interactive then
                         io.stderr:write(interactive.prompt or "")