2 files changed, 8 insertions, 15 deletions

@@ -5,14 +5,6 @@ local type = require "type"
 local isNull = type.isNull
 
 base.env = {
-        begin =
-                function (r)
-                        local r = r
-                        while not isNull(r.cdr) do
-                                r = r.cdr
-                        end
-                        return r.car
-                end,
         ["+"] =
                 function (r)
                         local r, a = r, 0
@@ -32,9 +32,13 @@ function eval.Proc (params, body, env)
                                         p, a = p.cdr, a.cdr
                                 end
                                 pp.pp(self.body)
-                                return eval.eval(
-                                        self.body,
-                                        eval.Env(inner, self.env))
+                                local b = self.body
+                                local e = eval.Env(inner, self.env)
+                                while not isNull(b.cdr) do
+                                        eval.eval(b.car, e)
+                                        b = b.cdr
+                                end
+                                return eval.eval(b.car, e)
                         end,
         }
         return setmetatable(v, mt)
@@ -54,10 +58,7 @@ function eval.eval (x, env)
                         env[args.car] = eval.eval(args.cdr.car, env)
                         return nil
                 elseif op == "lambda" or op == "lam" then
-                        return eval.Proc(
-                                args.car,
-                                Cons("begin", args.cdr), -- i don't like this
-                                env)
+                        return eval.Proc(args.car, args.cdr, env)
                 elseif op == "if" then
                         assert(not isNull(args.cdr), "Malformed 'if'")
                         local test, conseq, alt =