From a0da0d952bff3c7ef84c78d334dafcccbc287336 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 16 Sep 2020 14:31:28 +0200 Subject: [PATCH] [borkdude/sci#401] Support implementing IDeref/IAtom/IAtom2 --- doc/build.md | 4 +++- sci | 2 +- src/babashka/impl/classes.clj | 4 ++-- src/babashka/impl/clojure/core.clj | 1 - 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/build.md b/doc/build.md index 705e707a..d80021e5 100644 --- a/doc/build.md +++ b/doc/build.md @@ -60,7 +60,9 @@ $ export BABASHKA_XMX="-J-Xmx6500m" Note: setting the max heap size to a low value can cause the build to crash or take long to complete. -To build on Windows, run `script\uberjar.bat` followed by `script\compile.bat`. +## Windows + +Run `script\uberjar.bat` followed by `script\compile.bat`. ## Feature flags diff --git a/sci b/sci index 81a8d483..441f7762 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 81a8d483462a1a4b487204846405a58e9f174c15 +Subproject commit 441f7762fec717df00e5b8a73692277ac7049672 diff --git a/src/babashka/impl/classes.clj b/src/babashka/impl/classes.clj index c22c2845..8d6bfbcc 100644 --- a/src/babashka/impl/classes.clj +++ b/src/babashka/impl/classes.clj @@ -236,8 +236,8 @@ :instance-checks [clojure.lang.IObj clojure.lang.IFn clojure.lang.IPending - clojure.lang.IDeref - clojure.lang.IAtom + ;; clojure.lang.IDeref + ;; clojure.lang.IAtom clojure.lang.IEditableCollection clojure.lang.IMapEntry clojure.lang.IPersistentMap diff --git a/src/babashka/impl/clojure/core.clj b/src/babashka/impl/clojure/core.clj index 9022d4f7..92c7bf3d 100644 --- a/src/babashka/impl/clojure/core.clj +++ b/src/babashka/impl/clojure/core.clj @@ -32,7 +32,6 @@ 'spit (copy-core-var spit) 'time (with-meta time* {:sci/macro true}) 'Throwable->map (copy-core-var Throwable->map) - 'compare-and-set! (copy-core-var compare-and-set!) 'tap> (copy-core-var tap>) 'add-tap (copy-core-var add-tap) 'remove-tap (copy-core-var remove-tap)