sci: migrate to edamame (#74)

This commit is contained in:
Michiel Borkent 2019-09-24 23:35:15 +02:00 committed by GitHub
parent ddf7de4d2c
commit 8a4ab771d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions

View file

@ -11,6 +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.4"]
[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"]]
:profiles {:test {:dependencies [[clj-commons/conch "0.9.2"]]} :profiles {:test {:dependencies [[clj-commons/conch "0.9.2"]]}

2
sci

@ -1 +1 @@
Subproject commit a9f96ef680bc055649508b99b590133605c34014 Subproject commit 095e66ed99b57089f1478bd17ae2f23710273867

View file

@ -24,10 +24,10 @@
(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)] (let [v (parser/parse-next in)]
(if (or (identical? :repl/quit v) (if (or (identical? :repl/quit v)
(identical? :repl/exit v) (identical? :repl/exit v)
(identical? :sci.impl.parser/eof v)) (identical? :edamame.impl.parser/eof v))
request-exit request-exit
v)) v))
request-exit)) request-exit))