Merge pull request #50 from jafingerhut/fix-crrbv-30

Test and fix for CRRBV-30

Author: jafingerhut

src/main/cljs/clojure/core/rrb_vector/rrbt.cljs

@@ -316,7 +316,7 @@
   IIndexed
   (-nth [this i]
     (if (and (<= 0 i) (< i cnt))
-      (let [tail-off (- cnt (alength tail))]
+      (let [tail-off (-tail-offset this)]
         (if (<= tail-off i)
           (aget tail (- i tail-off))
           (loop [i i node root shift shift]
@@ -1192,6 +1192,57 @@
                     ^:mutable root
                     ^:mutable tail
                     ^:mutable tidx]
+
+  ;; The Clojure/Java deftype Transient implements the Java interface
+  ;; clojure.lang.ILookup.  The corresponding ClojureScript protocol
+  ;; named ILookup is implemented by the deftype Vector in this file.
+  ;; TBD: Should ILookup be implemented by type Transient, too?
+
+  IIndexed
+  (-nth [this i]
+    (if (and (<= 0 i) (< i cnt))
+      (let [tail-off (-tail-offset this)]
+        (if (<= tail-off i)
+          (aget tail (- i tail-off))
+          (loop [i i node root shift shift]
+            (if (zero? shift)
+              (let [arr (.-arr node)]
+                (aget arr (bit-and (bit-shift-right i shift) 0x1f)))
+              (if (regular? node)
+                (let [arr (.-arr node)
+                      idx (bit-and (bit-shift-right i shift) 0x1f)]
+                  (loop [i     i
+                         node  (aget arr idx)
+                         shift (- shift 5)]
+                    (let [arr (.-arr node)
+                          idx (bit-and (bit-shift-right i shift) 0x1f)]
+                      (if (zero? shift)
+                        (aget arr idx)
+                        (recur i (aget arr idx) (- shift 5))))))
+                (let [arr  (.-arr node)
+                      rngs (node-ranges node)
+                      idx  (loop [j (bit-and (bit-shift-right i shift) 0x1f)]
+                             (if (< i (aget rngs j))
+                               j
+                               (recur (inc j))))
+                      i    (if (zero? idx)
+                             i
+                             (- i (aget rngs (dec idx))))]
+                  (recur i (aget arr idx) (- shift 5))))))))
+      (vector-index-out-of-bounds i cnt)))
+
+  (-nth [this i not-found]
+    (if (and (>= i 0) (< i cnt))
+      (-nth this i)
+      not-found))
+
+  IFn
+  (-invoke [this k]
+    (-nth this k))
+
+  (-invoke [this k not-found]
+    (-nth this k not-found))
+
   ITransientCollection
   (-conj! [this o]
     (if ^boolean (.-edit root)
@@ -1254,7 +1305,7 @@
     (if ^boolean (.-edit root)
       (cond
         (and (<= 0 i) (< i cnt))
-        (let [tail-off (- cnt tidx)]
+        (let [tail-off (-tail-offset this)]
           (if (<= tail-off i)
             (aset tail (- i tail-off) val)
             (set! root (do-assoc! shift (.-edit root) root i val)))

src/main/clojure/clojure/core/rrb_vector/rrbt.clj

@@ -548,7 +548,7 @@
   clojure.lang.Indexed
   (nth [this i]
     (if (and (<= (int 0) i) (< i cnt))
-      (let [tail-off (unchecked-subtract-int cnt (.alength am tail))]
+      (let [tail-off (.tailoff this)]
         (if (<= tail-off i)
           (.aget am tail (unchecked-subtract-int i tail-off))
           (loop [i i node root shift shift]
@@ -1865,7 +1865,7 @@
   (nth [this i]
     (.ensureEditable transient-helper nm root)
     (if (and (<= (int 0) i) (< i cnt))
-      (let [tail-off (unchecked-subtract-int cnt (.alength am tail))]
+      (let [tail-off (.tailoff this)]
         (if (<= tail-off i)
           (.aget am tail (unchecked-subtract-int i tail-off))
           (loop [i i node root shift shift]
@@ -1998,7 +1998,7 @@
     (.ensureEditable transient-helper nm root)
     (cond
       (and (<= 0 i) (< i cnt))
-      (let [tail-off (unchecked-subtract-int cnt tidx)]
+      (let [tail-off (.tailoff this)]
         (if (<= tail-off i)
           (.aset am tail (unchecked-subtract-int i tail-off) val)
           (set! root (.doAssoc transient-helper nm am

src/test/cljs/clojure/core/rrb_vector/test_common.cljs

@@ -552,3 +552,20 @@
   (u/reset-optimizer-counts!)
   (is (integer? (puzzle-b-rrbv 978)))
   (u/print-optimizer-counts))
+
+(deftest test-crrbv-30
+  (let [v1 [1 2 3]
+        tv1 (transient [1 2 3])
+        fv1 (fv/vector 1 2 3)
+        tfv1 (transient (fv/vector 1 2 3))]
+    (doseq [[v msg] [[v1 ""]
+                     [fv1 ""]
+                     [(map #(nth v1 %) [0 1 2])   "#(nth v1 %)"]
+                     [(map #(v1 %) [0 1 2])       "#(v1 %)"]
+                     [(map #(nth tv1 %) [0 1 2])  "#(nth tv1 %)"]
+                     [(map #(tv1 %) [0 1 2])      "#(tv1 %)"]
+                     [(map #(nth fv1 %) [0 1 2])  "#(nth fv1 %)"]
+                     [(map #(fv1 %) [0 1 2])      "#(fv1 %)"]
+                     [(map #(nth tfv1 %) [0 1 2]) "#(nth tfv1 %)"]
+                     [(map #(tfv1 %) [0 1 2])     "#(tfv1 %)"]]]
+      (is (= '(1 2 3) v) (str "Failing case: " msg)))))

src/test/clojure/clojure/core/rrb_vector/test_common.clj

@@ -553,3 +553,20 @@
   (u/reset-optimizer-counts!)
   (is (integer? (puzzle-b-rrbv 978)))
   (u/print-optimizer-counts))
+
+(deftest test-crrbv-30
+  (let [v1 [1 2 3]
+        tv1 (transient [1 2 3])
+        fv1 (fv/vector 1 2 3)
+        tfv1 (transient (fv/vector 1 2 3))]
+    (doseq [[v msg] [[v1 "v1"]
+                     [fv1 "fv1"]
+                     [(map #(nth v1 %) [0 1 2])   "#(nth v1 %)"]
+                     [(map #(v1 %) [0 1 2])       "#(v1 %)"]
+                     [(map #(nth tv1 %) [0 1 2])  "#(nth tv1 %)"]
+                     [(map #(tv1 %) [0 1 2])      "#(tv1 %)"]
+                     [(map #(nth fv1 %) [0 1 2])  "#(nth fv1 %)"]
+                     [(map #(fv1 %) [0 1 2])      "%(fv1 %)"]
+                     [(map #(nth tfv1 %) [0 1 2]) "#(nth tfv1 %)"]
+                     [(map #(tfv1 %) [0 1 2])     "#(tfv1 %)"]]]
+      (is (= '(1 2 3) v) (str "Failing case: " msg)))))