migrated datascript to SortedSet.java

Author: tonsky

bench.sh

@@ -1 +1 @@
-javac -d target/classes -cp `clojure -A:datomic -Spath` -Xlint:unchecked src-java/datascript/*.java && java -ea -cp `clojure -A:datomic -Spath`:target/classes datascript.Bench
+javac -d target/classes -cp `clojure -A:datomic -Spath` -Xlint:unchecked src-java/datascript/*.java test-java/datascript/*.java && java -ea -cp `clojure -A:datomic -Spath`:target/classes datascript.Bench

deps.edn

@@ -12,7 +12,7 @@
     }
 
     :dev {
-      :extra-paths ["dev"]
+      :extra-paths ["dev" "target/classes"]
       :extra-deps {
         org.clojure/tools.namespace {:mvn/version "0.2.11"}
       }

project.clj

@@ -13,14 +13,15 @@
 
   :plugins [
     [lein-cljsbuild "1.1.7"]
+    ; [lein-virgil "0.1.9"]
   ]
 
   :global-vars {
     *warn-on-reflection*   true
     *print-namespace-maps* false
 ;;     *unchecked-math* :warn-on-boxed
   }
-  
+  :java-source-paths ["src-java"]  
   :jvm-opts ["-Xmx2g" "-server"]
 
   :aliases {"test-clj"     ["run" "-m" "datascript.test/test-most"]

src-java/datascript/ASortedSet.java

@@ -3,11 +3,8 @@
 import java.util.*;
 import clojure.lang.*;
 
-//  clojure.lang.Reversible
-//  (rseq [this] (rseq (btset-iter this)))
-
 @SuppressWarnings("unchecked")
-public abstract class ASortedSet implements IObj, IPersistentSet, ILookup, Iterable, Set, java.io.Serializable, IHashEq {
+public abstract class ASortedSet implements IObj, Counted, IPersistentSet, ILookup, Iterable, Set, java.io.Serializable, IHashEq {
   int _hash;
   int _hasheq;
   final IPersistentMap _meta;