Change names and hoist eval

read is unimplemented and load is buggy

1 files changed, 21 insertions, 3 deletions

@@ -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 "")