From 1974a2362d056cf2d35fe81194ab73a6e90e8fba Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sun, 15 Dec 2019 20:55:16 +0100 Subject: [PATCH] Update sci: fix for nested syntax quote --- project.clj | 2 +- sci | 2 +- src/babashka/impl/repl.clj | 2 +- test/babashka/impl/socket_repl_test.clj | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 2c27951a..4703e378 100644 --- a/project.clj +++ b/project.clj @@ -11,7 +11,7 @@ :resource-paths ["resources" "sci/resources"] :dependencies [[org.clojure/clojure "1.10.1"] [org.clojure/tools.reader "1.3.2"] - [borkdude/edamame "0.0.9-alpha.2"] + [borkdude/edamame "0.0.10-alpha.2"] [org.clojure/core.async "0.4.500"] [org.clojure/tools.cli "0.4.2"] [org.clojure/data.csv "0.1.4"] diff --git a/sci b/sci index 25b0628b..07d28ee5 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 25b0628b546e08fe7fec0bb09168e286b3685d91 +Subproject commit 07d28ee572e90a629e01b10aa5b98cb33ccdc1e5 diff --git a/src/babashka/impl/repl.clj b/src/babashka/impl/repl.clj index 68b461fb..d97cec3a 100644 --- a/src/babashka/impl/repl.clj +++ b/src/babashka/impl/repl.clj @@ -23,7 +23,7 @@ (println)) :read (fn [_request-prompt request-exit] (if (r/peek-char in) ;; if this is nil, we reached EOF - (let [v (parser/parse-next in #{:bb} {:current (-> sci-ctx :env deref :current-ns)})] + (let [v (parser/parse-next sci-ctx in)] (if (or (identical? :repl/quit v) (identical? :repl/exit v) (identical? :edamame.impl.parser/eof v)) diff --git a/test/babashka/impl/socket_repl_test.clj b/test/babashka/impl/socket_repl_test.clj index df9f4f62..085561dd 100644 --- a/test/babashka/impl/socket_repl_test.clj +++ b/test/babashka/impl/socket_repl_test.clj @@ -36,7 +36,8 @@ (delay [1 2 3]) '*command-line-args* ["a" "b" "c"]} - :env (atom {})}) + :env (atom {}) + :features #{:bb}}) (future (sh "bash" "-c" "echo '[1 2 3]' | ./bb --socket-repl 0.0.0.0:1666 a b c")))