use same hashCode in seqs and lists as in vectors

arthuredelstein · Jan 6, 2009 · 467568d · 467568d
1 parent 2ea265f
commit 467568d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/jvm/clojure/lang/ASeq.java b/src/jvm/clojure/lang/ASeq.java
@@ -52,16 +52,17 @@ 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.rest())
 			{
-			hash = Util.hashCombine(hash, Util.hash(s.first()));
+			hash = 31 * hash + (s.first() == null ? 0 : s.first().hashCode());
 			}
 		this._hash = hash;
 		}
 	return _hash;
 }
 
+
 //public Object reduce(IFn f) throws Exception{
 //	Object ret = first();
 //	for(ISeq s = rest(); s != null; s = s.rest())

diff --git a/src/jvm/clojure/lang/PersistentList.java b/src/jvm/clojure/lang/PersistentList.java
@@ -114,6 +114,11 @@ public Object reduce(IFn f, Object start) throws Exception{
 
 static class EmptyList extends Obj implements IPersistentList, Collection{
 
+	@Override
+	public int hashCode(){
+		return 1;
+	}
+
 	EmptyList(IPersistentMap meta){
 		super(meta);
 	}