Merge branch 'fix-multi-line-sexprs-in-repl' into 'master'

Adds support for entering multi-line sexprs in REPL

See merge request alexjgriffith/min-love2d-fennel!1

lib/stdio.fnl

@@ -1,4 +1,5 @@
 (require "love.event")
+(local fennel (require "lib.fennel"))
 (local view (require "lib.fennelview"))
 
 ;; This module exists in order to expose stdio over a channel so that it
@@ -6,14 +7,39 @@
 
 (local (event channel) ...)
 
+(defn display [s]
+  (io.write s)
+  (io.flush))
+
+(defn prompt []
+  (display "\n>> "))
+
+(defn read-chunk []
+  (let [input (io.read)]
+    (when input
+      (.. input "\n"))))
+
+(var input "")
 (when channel
-  (let [prompt (fn [] (io.write "> ") (io.flush) (io.read "*l"))]
+  (let [(bytestream clearstream) (fennel.granulate read-chunk)
-    ((fn looper [input]
+        read (fennel.parser
-       (when input
+              (fn []
-         ;; This is consumed by love.handlers[event]
+                (let [c (or (bytestream) 10)]
-         (love.event.push event input)
+                  (set input (.. input (string.char c)))
-         (print (: channel :demand))
+                  c)))]
-         (looper (prompt)))) (prompt))))
+    (while true
+      (prompt)
+      (set input "")
+      (let [(ok ast) (pcall read)]
+        (if (not ok)
+            (do
+              (display (.. "Parse error:" ast "\n"))
+              ;; fixme: not sure why the following fails
+              ;; (clearstream)
+              )
+            (do
+              (love.event.push event input)
+              (display (: channel :demand))))))))
 
 {:start (fn start-repl []
           (let [code (love.filesystem.read "stdio.fnl")

lib/stdio.lua

@@ -1,22 +1,50 @@
 require("love.event")
+local fennel = require("lib.fennel")
 local view = require("lib.fennelview")
 local event, channel = ...
+local function display(s)
+  io.write(s)
+  return io.flush()
+end
+do local _ = display end
+local function prompt()
+  return display("\n>> ")
+end
+do local _ = prompt end
+local function read_chunk()
+  local input = io.read()
+  if input then
+    return (input .. "\n")
+  end
+end
+do local _ = read_chunk end
+local input = ""
 local function _0_(...)
   if channel then
+    local bytestream, clearstream = fennel.granulate(read_chunk)
     local function _0_()
-      io.write("> ")
+      local c = (bytestream() or 10)
-      io.flush()
+      input = (input .. string.char(c))
-      return io.read("*l")
+      return c
     end
-    local prompt = _0_
+    local read = fennel.parser(_0_)
-    local function looper(input)
+    while true do
-      if input then
+      prompt()
-        love.event.push(event, input)
+      input = ""
-        print(channel:demand())
+      do
-        return looper(prompt())
+        local ok, ast = pcall(read)
+        local function _1_(...)
+          if not ok then
+            return display(("Parse error:" .. ast .. "\n"))
+          else
+            love.event.push(event, input)
+            return display(channel:demand())
+          end
+        end
+        _1_(...)
       end
     end
-    return looper(prompt())
+    return nil
   end
 end
 _0_(...)
@@ -47,4 +75,4 @@ local function start_repl()
   love.handlers.eval = _2_
   return nil
 end
-return ({start = start_repl})
+return {start = start_repl}