1 files changed, 4 insertions, 77 deletions
diff --git a/repl.lua b/repl.lua
index c4a6546..4bdd918 100644
--- a/repl.lua
+++ b/repl.lua

@@ -1,25 +1,9 @@
 --- lam.repl
 local m = {}
-local _r = require("read")
+local load = require("load").load
-local read, inport, read_string, eof =
-        _r.read, _r.inport, _r.read_string, _r.eof
-local eval = require("eval").eval
-local function schemeprint (x)
+m.logo = [[
-        -- if x == nil then return end
-        if x == true then
-                print("#t")
-        elseif x == false then
-                print("#f")
-        elseif x == nil then
-                print("#<nil>")
-        else
-                print(x)
-        end
-end
-local lam = [[
 @,,,@
 <|^ ^|>  l a m
 |   /)   0015
@@ -27,66 +11,9 @@ local lam = [[
 -------------
 ]]
-local function handle_error (e)
-        local start = e:find(": ")
-        return e:sub(start + 2)
-end
-function m.read_eval (filename, interactive)
-        -- interactive = { out = file or handle, prompt = string, }
-        local inport = inport(filename)
-        local prompt = interactive and interactive.prompt or "> "
-        if interactive then
-                io.output(interactive.out or io.stdout)
-                io.write(lam)
-                io.output():setvbuf("line")
-        else
-                io.output():setvbuf("no")
-        end
-        repeat
-                if interactive then
-                        io.stderr:write(prompt)
-                        io.stderr:flush()
-                end
-                -- read
-                local ok, x = xpcall(
-                        function ()
-                                local nxt = read(inport)
-                                return nxt
-                        end,
-                        handle_error
-                )
-                if not ok then
-                        io.stderr:write("(read) not ok: ", x, "\n")
-                        -- in interactive mode, errors should not be fatal.  in
-                        -- batch mode, they should be.
-                        if not interactive then return nil end
-                end
-                -- eval
-                if ok then
-                        local ok, v = xpcall(
-                                function () return eval(x) end,
-                                handle_error
-                        )
-                        if not ok then
-                                io.stderr:write("(eval) not ok: ", v, "\n")
-                                if not interactive then return nil end
-                        end
-                        -- print
-                        if ok and interactive then schemeprint(v) end
-                elseif interactive then
-                        ok = "recover"
-                end
-        until x == eof -- loop
-        inport:close()
-end
 function m.repl (prompt)
-        return m.read_eval(nil, { prompt = prompt, })
+        io.stderr:write(m.logo)
-end
+        return load(nil, {prompt = prompt or "> ", })
-function m.load (filename)
-        return m.read_eval(filename)
 end
 --------

diff --git a/repl.lua b/repl.lua index c4a6546..4bdd918 100644 --- a/repl.lua +++ b/repl.lua
@@ -1,25 +1,9 @@
1	--- lam.repl	1	--- lam.repl
2		2
3	local m = {}	3	local m = {}
4	local _r = require("read")	4	local load = require("load").load
5	local read, inport, read_string, eof =
6	_r.read, _r.inport, _r.read_string, _r.eof
7	local eval = require("eval").eval
8		5
9	local function schemeprint (x)	6	m.logo = [[
10	-- if x == nil then return end
11	if x == true then
12	print("#t")
13	elseif x == false then
14	print("#f")
15	elseif x == nil then
16	print("#<nil>")
17	else
18	print(x)
19	end
20	end
21
22	local lam = [[
23	@,,,@	7	@,,,@
24	<\|^ ^\|> l a m	8	<\|^ ^\|> l a m
25	\| /) 0015	9	\| /) 0015
@@ -27,66 +11,9 @@ local lam = [[
27	-------------	11	-------------
28	]]	12	]]
29		13
30	local function handle_error (e)
31	local start = e:find(": ")
32	return e:sub(start + 2)
33	end
34
35	function m.read_eval (filename, interactive)
36	-- interactive = { out = file or handle, prompt = string, }
37	local inport = inport(filename)
38	local prompt = interactive and interactive.prompt or "> "
39	if interactive then
40	io.output(interactive.out or io.stdout)
41	io.write(lam)
42	io.output():setvbuf("line")
43	else
44	io.output():setvbuf("no")
45	end
46	repeat
47	if interactive then
48	io.stderr:write(prompt)
49	io.stderr:flush()
50	end
51	-- read
52	local ok, x = xpcall(
53	function ()
54	local nxt = read(inport)
55	return nxt
56	end,
57	handle_error
58	)
59	if not ok then
60	io.stderr:write("(read) not ok: ", x, "\n")
61	-- in interactive mode, errors should not be fatal. in
62	-- batch mode, they should be.
63	if not interactive then return nil end
64	end
65	-- eval
66	if ok then
67	local ok, v = xpcall(
68	function () return eval(x) end,
69	handle_error
70	)
71	if not ok then
72	io.stderr:write("(eval) not ok: ", v, "\n")
73	if not interactive then return nil end
74	end
75	-- print
76	if ok and interactive then schemeprint(v) end
77	elseif interactive then
78	ok = "recover"
79	end
80	until x == eof -- loop
81	inport:close()
82	end
83
84	function m.repl (prompt)	14	function m.repl (prompt)
85	return m.read_eval(nil, { prompt = prompt, })	15	io.stderr:write(m.logo)
86	end	16	return load(nil, {prompt = prompt or "> ", })
87
88	function m.load (filename)
89	return m.read_eval(filename)
90	end	17	end
91		18
92	--------	19	--------