Merge pull request #42 from borkdude/bb-support

Add babashka support

Author: huahaiy

.github/workflows/build.yml

@@ -26,6 +26,7 @@ jobs:
          uses: DeLaGuardo/setup-clojure@13.0
          with:
           lein: 2.9.1
+          bb: latest
 
        - uses: actions/setup-node@v4
          with:
@@ -36,3 +37,9 @@ jobs:
 
        - name: Run node tests
          run: lein doo node once
+
+       - name: Run babashka tests
+         run: |
+           # This installs a bb dev build. Once bb is released, we can remove this and run bb test:bb instead
+           bash <(curl https://raw.githubusercontent.com/babashka/babashka/master/install)  --dev-build --dir .
+           ./bb test:bb

bb.edn

@@ -0,0 +1,6 @@
+{:tasks
+ {test:bb {:extra-paths ["src" "test"]
+           :extra-deps {io.github.cognitect-labs/test-runner
+                        {:git/tag "v0.5.0" :git/sha "b3fd0d2"}
+                        org.clojure/test.check {:mvn/version "1.1.1"}}
+           :task cognitect.test-runner/-main}}}

src/editscript/diff/a_star.cljc

@@ -35,16 +35,17 @@
      ;; Java's native hash is too slow,
      ;; overriding hashCode significantly speeds things up
      Object
-     (hashCode [_] (coord-hash a b))
+     #?@(:clj [(hashCode [_] (coord-hash a b))])
      (equals [_ that]
        (and (= (i/get-order a) (i/get-order (.-a ^Coord that)))
             (= (i/get-order b) (i/get-order (.-b ^Coord that)))))
      (toString [_]
        (str "[" (i/get-value a) "," (i/get-value b) "]"))
 
-     Comparable
-     (compareTo [this that]
-       (- (.hashCode this) (.hashCode that))))
+     #?@(:bb []
+         :clj [Comparable
+               (compareTo [this that]
+                          (- (.hashCode this) (.hashCode that)))]))
    :cljr
    (deftype Coord [^Node a
                    ^Node b]

src/editscript/util/pairing.cljc

@@ -9,7 +9,8 @@
 ;;
 
 (ns ^:no-doc editscript.util.pairing
-  #?(:clj
+  #?(:bb (:require [clojure.data.priority-map])
+     :clj
      (:import [clojure.lang IPersistentStack IPersistentMap IPersistentCollection]
               [java.io Writer])
 	  :cljr
@@ -68,7 +69,8 @@
       (set-right b nil)
       (merge-nodes (merge-nodes a b) (two-pass n)))))
 
-#?(:clj
+#?(:bb nil
+   :clj
    (deftype PriorityMap [^:unsynchronized-mutable ^HeapNode heap
                          ^:unsynchronized-mutable map]
      IPersistentCollection
@@ -175,13 +177,15 @@
          (set! heap n)
          this))))
 
-(defn priority-map
-  "A priority queue that also functions as a map.
+#?(:bb (def priority-map clojure.data.priority-map/priority-map)
+   :default
+   (defn priority-map
+     "A priority queue that also functions as a map.
   Backed by a pairing heap implementation, and a regular map.
   NB. We do not implement `decrease-key` for the pairing heap,
   instead just insert the item again with a new priority."
-  ([]
-   (->PriorityMap nil {}))
-  ([& keyvals]
-   {:pre [(even? (count keyvals))]}
-   (reduce conj (priority-map) (partition 2 keyvals))))
+     ([]
+      (->PriorityMap nil {}))
+     ([& keyvals]
+      {:pre [(even? (count keyvals))]}
+      (reduce conj (priority-map) (partition 2 keyvals)))))