diff --git a/deps.edn b/deps.edn index 61c36244..15f1651e 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["src" "sci/src" "babashka.curl/src" "resources" "sci/resources"], :deps {org.clojure/clojure {:mvn/version "1.10.2-alpha1"}, org.clojure/tools.reader {:mvn/version "1.3.2"}, - borkdude/edamame {:mvn/version "0.0.11-alpha.6"}, + borkdude/edamame {:mvn/version "0.0.11-alpha.8"}, borkdude/graal.locking {:mvn/version "0.0.2"}, borkdude/sci.impl.reflector {:mvn/version "0.0.1"} org.clojure/core.async {:mvn/version "1.0.567"}, diff --git a/project.clj b/project.clj index de221f34..43676d95 100644 --- a/project.clj +++ b/project.clj @@ -13,7 +13,7 @@ :resource-paths ["resources" "sci/resources"] :dependencies [[org.clojure/clojure "1.10.2-alpha1"] [org.clojure/tools.reader "1.3.2"] - [borkdude/edamame "0.0.11-alpha.6"] + [borkdude/edamame "0.0.11-alpha.8"] [borkdude/graal.locking "0.0.2"] [borkdude/sci.impl.reflector "0.0.1"] [org.clojure/core.async "1.0.567"] diff --git a/sci b/sci index b425eede..22bd9221 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit b425eedeebd8612d42befa92b800a25c824b8c49 +Subproject commit 22bd92211c82b885b079b94d175eb821edb2e9b4 diff --git a/src/babashka/impl/repl.clj b/src/babashka/impl/repl.clj index e98ffce3..9e2674c8 100644 --- a/src/babashka/impl/repl.clj +++ b/src/babashka/impl/repl.clj @@ -38,16 +38,12 @@ (eval-form sci-ctx '(use 'clojure.repl)))) :read (or read (fn [_request-prompt request-exit] - ;; (prn "PEEK" @sci/in (r/peek-char @sci/in)) - ;; (prn "PEEK" @sci/in (r/peek-char @sci/in)) this works fine - (if (r/peek-char in) ;; if this is nil, we reached EOF - (let [v (parser/parse-next sci-ctx in)] - (if (or (identical? :repl/quit v) - (identical? :repl/exit v) - (identical? :edamame.impl.parser/eof v)) - request-exit - v)) - request-exit))) + (let [v (parser/parse-next sci-ctx in)] + (if (or (identical? :repl/quit v) + (identical? :repl/exit v) + (identical? :edamame.impl.parser/eof v)) + request-exit + v)))) :eval (or eval (fn [expr] (let [ret (eval-form (update sci-ctx