diff --git a/deps.edn b/deps.edn index c09a693c..61c36244 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.10"}, + borkdude/edamame {:mvn/version "0.0.11-alpha.6"}, 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 87d98573..de221f34 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.10"] + [borkdude/edamame "0.0.11-alpha.6"] [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 f5161caf..1b106678 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit f5161cafd86bdd4a139d5427a26e5a3fa87734b1 +Subproject commit 1b106678929b46a8bc74364b3b0c6e2fc53eaab8 diff --git a/script/lib_tests/regal_test b/script/lib_tests/regal_test index ad313fe9..4073c9e6 100755 --- a/script/lib_tests/regal_test +++ b/script/lib_tests/regal_test @@ -2,7 +2,7 @@ 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 BB_CMD="./bb" @@ -10,4 +10,13 @@ else BB_CMD="lein bb" 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\")) +" diff --git a/test/babashka/main_test.clj b/test/babashka/main_test.clj index 7161b483..10d41ac7 100644 --- a/test/babashka/main_test.clj +++ b/test/babashka/main_test.clj @@ -247,6 +247,7 @@ (deftest reader-conditionals-test (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 (= [1 2] (bb nil "[1 2 #?@(:bb [] :clj [1])]"))))