diff --git a/project.clj b/project.clj index 4373c91a..c299173a 100644 --- a/project.clj +++ b/project.clj @@ -19,7 +19,7 @@ :test-selectors {:default (complement :windows-only) :windows (complement :skip-windows)} :dependencies [[org.clojure/clojure "1.11.0"] - [borkdude/edamame "0.0.19"] + [borkdude/edamame "1.0.0"] [borkdude/graal.locking "0.0.2"] [org.clojure/tools.cli "1.0.206"] [cheshire "5.10.2"] diff --git a/sci b/sci index 12ef1bf6..6c10e494 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 12ef1bf6246370d9b02791c9794e5deee790d9a9 +Subproject commit 6c10e494371a37a56bef45c8148435888bae3a45 diff --git a/src/babashka/impl/edamame.clj b/src/babashka/impl/edamame.clj new file mode 100644 index 00000000..62035e3d --- /dev/null +++ b/src/babashka/impl/edamame.clj @@ -0,0 +1,7 @@ +(ns babashka.impl.edamame + (:require [edamame.core] + [sci.core :as sci])) + +(def ens (sci/create-ns 'edamame.core)) + +(def edamame-namespace (sci/copy-ns edamame.core ens)) diff --git a/src/babashka/main.clj b/src/babashka/main.clj index a9609562..35f0e107 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -10,7 +10,8 @@ [babashka.impl.classes :as classes] [babashka.impl.classpath :as cp :refer [classpath-namespace]] [babashka.impl.clojure.core :as core :refer [core-extras]] - [babashka.impl.clojure.core.async :refer [async-namespace async-protocols-namespace]] + [babashka.impl.clojure.core.async :refer [async-namespace + async-protocols-namespace]] [babashka.impl.clojure.instant :as instant] [babashka.impl.clojure.java.browse :refer [browse-namespace]] [babashka.impl.clojure.java.io :refer [io-namespace]] @@ -18,7 +19,8 @@ [babashka.impl.clojure.main :as clojure-main :refer [demunge]] [babashka.impl.clojure.math :refer [math-namespace]] [babashka.impl.clojure.stacktrace :refer [stacktrace-namespace]] - [babashka.impl.clojure.tools.reader-types :refer [edn-namespace reader-types-namespace]] + [babashka.impl.clojure.tools.reader-types :refer [edn-namespace + reader-types-namespace]] [babashka.impl.clojure.zip :refer [zip-namespace]] [babashka.impl.common :as common] [babashka.impl.core :as bbcore] @@ -26,6 +28,7 @@ [babashka.impl.data :as data] [babashka.impl.datafy :refer [datafy-namespace]] [babashka.impl.deps :as deps :refer [deps-namespace]] + [babashka.impl.edamame :refer [edamame-namespace]] [babashka.impl.error-handler :refer [error-handler]] [babashka.impl.features :as features] [babashka.impl.fs :refer [fs-namespace]] @@ -392,7 +395,8 @@ Use bb run --help to show this help output. 'clojure.core.rrb-vector (if features/rrb-vector? @(resolve 'babashka.impl.rrb-vector/rrb-vector-namespace) {'catvec (sci/copy-var catvec - (sci/create-ns 'clojure.core.rrb-vector))})} + (sci/create-ns 'clojure.core.rrb-vector))}) + 'edamame.core edamame-namespace} features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace) 'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace) 'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))