CLJ-1070 make PersistentQueue's hash & equiv match

philandstuff · stuarthalloway · commit a34e8f478220 · 2012-10-20T10:15:35.000-04:00
Signed-off-by: Stuart Halloway &lt;stu@thinkrelevance.com&gt;
diff --git a/src/jvm/clojure/lang/PersistentQueue.java b/src/jvm/clojure/lang/PersistentQueue.java
@@ -21,7 +21,7 @@
  * so no reversing or suspensions required for persistent use
  */
 
-public class PersistentQueue extends Obj implements IPersistentList, Collection, Counted{
+public class PersistentQueue extends Obj implements IPersistentList, Collection, Counted, IHashEq{
 
 final public static PersistentQueue EMPTY = new PersistentQueue(null, 0, null, null);
 
@@ -70,16 +70,25 @@ public boolean equals(Object obj){
 public int hashCode(){
 	if(_hash == -1)
 		{
-		int hash = 0;
+		int hash = 1;
 		for(ISeq s = seq(); s != null; s = s.next())
 			{
-			hash = Util.hashCombine(hash, Util.hash(s.first()));
+			hash = 31 * hash + (s.first() == null ? 0 : s.first().hashCode());
 			}
 		this._hash = hash;
 		}
 	return _hash;
 }
 
+public int hasheq() {
+    int hash = 1;
+    for(ISeq s = seq(); s != null; s = s.next())
+    {
+        hash = 31 * hash + Util.hasheq(s.first());
+    }
+    return hash;
+}
+
 public Object peek(){
 	return RT.first(f);
 }
diff --git a/test/clojure/test_clojure/data_structures.clj b/test/clojure/test_clojure/data_structures.clj
@@ -865,6 +865,9 @@
     (are [x y] (= x y)
       EMPTY EMPTY
       (into EMPTY (range 50)) (into EMPTY (range 50))
+      (conj EMPTY (Long. -1)) (conj EMPTY (Integer. -1))
+      (hash (conj EMPTY (Long. -1))) (hash (conj EMPTY (Integer. -1)))
+      (hash [1 2 3]) (hash (conj EMPTY 1 2 3))
       (range 5) (into EMPTY (range 5))
       (range 1 6) (-> EMPTY
                     (into (range 6))

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`* so no reversing or suspensions required for persistent use`
`22`	`22`	`*/`
`23`	`23`
`24`		`-public class PersistentQueue extends Obj implements IPersistentList, Collection, Counted{`
	`24`	`+public class PersistentQueue extends Obj implements IPersistentList, Collection, Counted, IHashEq{`
`25`	`25`
`26`	`26`	`final public static PersistentQueue EMPTY = new PersistentQueue(null, 0, null, null);`
`27`	`27`
`@@ -70,16 +70,25 @@ public boolean equals(Object obj){`
`70`	`70`	`public int hashCode(){`
`71`	`71`	`if(_hash == -1)`
`72`	`72`	`{`
`73`		`- int hash = 0;`
	`73`	`+ int hash = 1;`
`74`	`74`	`for(ISeq s = seq(); s != null; s = s.next())`
`75`	`75`	`{`
`76`		`- hash = Util.hashCombine(hash, Util.hash(s.first()));`
	`76`	`+ hash = 31 * hash + (s.first() == null ? 0 : s.first().hashCode());`
`77`	`77`	`}`
`78`	`78`	`this._hash = hash;`
`79`	`79`	`}`
`80`	`80`	`return _hash;`
`81`	`81`	`}`
`82`	`82`
	`83`	`+public int hasheq() {`
	`84`	`+ int hash = 1;`
	`85`	`+ for(ISeq s = seq(); s != null; s = s.next())`
	`86`	`+ {`
	`87`	`+ hash = 31 * hash + Util.hasheq(s.first());`
	`88`	`+ }`
	`89`	`+ return hash;`
	`90`	`+}`
	`91`	`+`
`83`	`92`	`public Object peek(){`
`84`	`93`	`return RT.first(f);`
`85`	`94`	`}`