Merge branch 'master' into clojure.data.xml

This commit is contained in:
Michiel Borkent 2019-12-16 13:55:18 +01:00
commit 218f5e94da
7 changed files with 8 additions and 7 deletions

View file

@ -11,7 +11,7 @@
:resource-paths ["resources" "sci/resources"] :resource-paths ["resources" "sci/resources"]
:dependencies [[org.clojure/clojure "1.10.1"] :dependencies [[org.clojure/clojure "1.10.1"]
[org.clojure/tools.reader "1.3.2"] [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/core.async "0.4.500"]
[org.clojure/tools.cli "0.4.2"] [org.clojure/tools.cli "0.4.2"]
[org.clojure/data.csv "0.1.4"] [org.clojure/data.csv "0.1.4"]

View file

@ -1 +1 @@
0.0.41 0.0.42

View file

@ -1 +1 @@
0.0.42-SNAPSHOT 0.0.43-SNAPSHOT

2
sci

@ -1 +1 @@
Subproject commit 9dd1cfa2536f5941e0de6351321cb2d17f8e40c6 Subproject commit 07d28ee572e90a629e01b10aa5b98cb33ccdc1e5

View file

@ -4,7 +4,7 @@
(defn thread (defn thread
[_ _ & body] [_ _ & body]
`(~'async/thread-call (fn [] ~@body))) `(~'clojure.core.async/thread-call (fn [] ~@body)))
(def async-namespace (def async-namespace
{'<!! async/<!! {'<!! async/<!!

View file

@ -23,7 +23,7 @@
(println)) (println))
:read (fn [_request-prompt request-exit] :read (fn [_request-prompt request-exit]
(if (r/peek-char in) ;; if this is nil, we reached EOF (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) (if (or (identical? :repl/quit v)
(identical? :repl/exit v) (identical? :repl/exit v)
(identical? :edamame.impl.parser/eof v)) (identical? :edamame.impl.parser/eof v))

View file

@ -36,7 +36,8 @@
(delay [1 2 3]) (delay [1 2 3])
'*command-line-args* '*command-line-args*
["a" "b" "c"]} ["a" "b" "c"]}
:env (atom {})}) :env (atom {})
:features #{:bb}})
(future (future
(sh "bash" "-c" (sh "bash" "-c"
"echo '[1 2 3]' | ./bb --socket-repl 0.0.0.0:1666 a b c"))) "echo '[1 2 3]' | ./bb --socket-repl 0.0.0.0:1666 a b c")))