Catch read errors

1 files changed, 16 insertions, 3 deletions

@@ -39,12 +39,24 @@ function m.repl (prompt, infile, out)
         if prompt then
                 stderr = io.open("/dev/stderr", "w") -- Linux-only !
         end
-        while true do
+        while true do -- loop
                 if prompt then
                         stderr:write(prompt)
                         stderr:flush()
                 end
-                local x = read.read(inport)
+                -- read
+                local ok, x = xpcall(
+                        function () return read.read(inport) end,
+                        function (e)
+                                local start = e:find(": ")
+                                return e:sub(start+2)
+                        end
+                )
+                if not ok then
+                        print("(read) not ok: " .. x)
+                        x = nil
+                end
+                -- eval
                 if x then
                         local ok, val =
                                 xpcall(
@@ -55,8 +67,9 @@ function m.repl (prompt, infile, out)
                                         end
                                 )
                         if not ok then
-                                print("not ok: " .. val)
+                                print("(eval) not ok: " .. val)
                         elseif out ~= false then
+                                -- print
                                 schemeprint(val)
                         end
                 end