CLJ-1364 Add hash and equality methods for primitive vec seqs

Signed-off-by: Stuart Halloway <stu@cognitect.com>

Author: puredanger

src/clj/clojure/gvec.clj

@@ -10,7 +10,8 @@
 
 (in-ns 'clojure.core)
 
-(import '(clojure.lang Murmur3))
+(import '(clojure.lang Murmur3 IHashEq Sequential Util SeqIterator)
+        '(java.util List))
 
 (set! *warn-on-reflection* true)
 
@@ -131,7 +132,37 @@
 
   clojure.lang.IObj
   (withMeta [_ m]
-    (new VecSeq am vec anode i offset m)))
+    (new VecSeq am vec anode i offset m))
+
+Object
+  (hashCode [this]
+    (loop [hash 1
+           s (seq this)]
+      (if s
+        (let [v (first s)]
+          (if (nil? v)
+            (recur (unchecked-multiply-int 31 hash) (next s))
+            (recur (unchecked-add-int (unchecked-multiply-int 31 hash) (.hashCode v)) (next s))))
+        hash)))
+  (equals [this other]
+    (cond (identical? this other) true
+          (or (instance? Sequential other) (instance? List other))
+          (loop [s this
+                 os (seq other)]
+            (if (nil? s)
+              (nil? os)
+              (if (Util/equals (first s) (first os))
+                (recur (next s) (next os))
+                false)))
+          :else false))
+
+  IHashEq
+  (hasheq [this]
+    (Murmur3/hashOrdered this))
+
+  Iterable
+  (iterator [this]
+    (SeqIterator. this)))
 
 (defmethod print-method ::VecSeq [v w]
   ((get (methods print-method) clojure.lang.ISeq) v w))

src/jvm/clojure/lang/MySeq.java

@@ -0,0 +1,18 @@
+package clojure.lang;
+
+public class MySeq extends ASeq {
+    @Override
+    public Object first() {
+        return null;
+    }
+
+    @Override
+    public ISeq next() {
+        return null;
+    }
+
+    @Override
+    public Obj withMeta(IPersistentMap meta) {
+        return null;
+    }
+}

test/clojure/test_clojure/data_structures.clj

@@ -14,7 +14,8 @@
         [clojure.test.generative :exclude (is)])
   (:require [clojure.test-clojure.generators :as cgen]
             [clojure.data.generators :as gen]
-            [clojure.string :as string]))
+            [clojure.string :as string])
+  (:import [java.util Collection]))
 
 
 ;; *** Helper functions ***
@@ -1107,7 +1108,11 @@
 (defn is-same-collection [a b]
   (let [msg (format "(class a)=%s (class b)=%s a=%s b=%s"
                     (.getName (class a)) (.getName (class b)) a b)]
-    (is (= (count a) (count b) (.size a) (.size b)) msg)
+    (is (= (count a) (count b)) msg)
+    (when (instance? Collection a)
+      (is (= (count a) (.size a)) msg))
+    (when (instance? Collection b)
+      (is (= (count b) (.size b)) msg))
     (is (= a b) msg)
     (is (= b a) msg)
     (is (.equals ^Object a b) msg)
@@ -1133,7 +1138,13 @@
                  (sequence (map identity) [-3 :a "7th"]) ]]
     (doseq [c1 colls1, c2 colls1]
       (is-same-collection c1 c2)))
-  (is-same-collection [-3 1 7] (vector-of :long -3 1 7)))
+  (let [long-colls [ [2 3 4]
+                     '(2 3 4)
+                     (vector-of :long 2 3 4)
+                     (seq (vector-of :long 2 3 4))
+                     (range 2 5)]]
+    (doseq [c1 long-colls, c2 long-colls]
+      (is-same-collection c1 c2))))
 
 (defn case-indendent-string-cmp [s1 s2]
   (compare (string/lower-case s1) (string/lower-case s2)))