luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump edamame, fixes #347

Browse source
This commit is contained in:
Michiel Borkent 2020-04-11 20:47:24 +02:00
parent 9396258d3e
commit 4109aa5264
5 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps.edn
View file

@ -1,7 +1,7 @@
{:paths ["src" "sci/src" "babashka.curl/src" "resources" "sci/resources"], {:paths ["src" "sci/src" "babashka.curl/src" "resources" "sci/resources"],
:deps {org.clojure/clojure {:mvn/version "1.10.2-alpha1"}, :deps {org.clojure/clojure {:mvn/version "1.10.2-alpha1"},
org.clojure/tools.reader {:mvn/version "1.3.2"}, org.clojure/tools.reader {:mvn/version "1.3.2"},
borkdude/edamame {:mvn/version "0.0.10"}, borkdude/edamame {:mvn/version "0.0.11-alpha.6"},
borkdude/graal.locking {:mvn/version "0.0.2"}, borkdude/graal.locking {:mvn/version "0.0.2"},
borkdude/sci.impl.reflector {:mvn/version "0.0.1"} borkdude/sci.impl.reflector {:mvn/version "0.0.1"}
org.clojure/core.async {:mvn/version "1.0.567"}, org.clojure/core.async {:mvn/version "1.0.567"},

2
project.clj
View file

@ -13,7 +13,7 @@
:resource-paths ["resources" "sci/resources"] :resource-paths ["resources" "sci/resources"]
:dependencies [[org.clojure/clojure "1.10.2-alpha1"] :dependencies [[org.clojure/clojure "1.10.2-alpha1"]
[org.clojure/tools.reader "1.3.2"] [org.clojure/tools.reader "1.3.2"]
[borkdude/edamame "0.0.10"] [borkdude/edamame "0.0.11-alpha.6"]
[borkdude/graal.locking "0.0.2"] [borkdude/graal.locking "0.0.2"]
[borkdude/sci.impl.reflector "0.0.1"] [borkdude/sci.impl.reflector "0.0.1"]
[org.clojure/core.async "1.0.567"] [org.clojure/core.async "1.0.567"]

2
sci

@ -1 +1 @@
Subproject commit f5161cafd86bdd4a139d5427a26e5a3fa87734b1 Subproject commit 1b106678929b46a8bc74364b3b0c6e2fc53eaab8

13
script/lib_tests/regal_test
View file

@ -2,7 +2,7 @@
set -eo pipefail set -eo pipefail
export BABASHKA_CLASSPATH="$(clojure -Sdeps '{:deps {regal {:git/url "https://github.com/lambdaisland/regal" :sha "d4e25e186f7b9705ebb3df6b21c90714d278efb7"}}}' -Spath)" export BABASHKA_CLASSPATH="$(clojure -Sdeps '{:deps {regal {:git/url "https://github.com/lambdaisland/regal" :sha "b059fdb06d5586a9a04c27e7b011c467ad8546db"}}}' -Spath)"
if [ "$BABASHKA_TEST_ENV" = "native" ]; then if [ "$BABASHKA_TEST_ENV" = "native" ]; then
BB_CMD="./bb" BB_CMD="./bb"
@ -10,4 +10,13 @@ else
BB_CMD="lein bb" BB_CMD="lein bb"
fi fi
$BB_CMD "(require '[lambdaisland.regal :as re]) (re/regex [:range \a \z])" $BB_CMD "
(require '[lambdaisland.regal :as regal])
(def r [:cat
[:+ [:class [\a \z]]]
\"=\"
[:+ [:not \=]]])
(prn (regal/regex r))
(prn (re-matches (regal/regex r) \"foo=bar\"))
"

1
test/babashka/main_test.clj
View file

@ -247,6 +247,7 @@
(deftest reader-conditionals-test (deftest reader-conditionals-test
(is (= :hello (bb nil "#?(:bb :hello :default :bye)"))) (is (= :hello (bb nil "#?(:bb :hello :default :bye)")))
(is (= :hello (bb nil "#? (:bb :hello :default :bye)")))
(is (= :hello (bb nil "#?(:clj :hello :bb :bye)"))) (is (= :hello (bb nil "#?(:clj :hello :bb :bye)")))
(is (= [1 2] (bb nil "[1 2 #?@(:bb [] :clj [1])]")))) (is (= [1 2] (bb nil "[1 2 #?@(:bb [] :clj [1])]"))))