symbol hash tweaks

Author: richhickey

src/jvm/clojure/lang/Symbol.java

@@ -20,8 +20,7 @@ public class Symbol extends AFn implements IObj, Comparable, Named, Serializable
 //these must be interned strings!
 final String ns;
 final String name;
-final int hash;
-final int hasheq;
+private int _hasheq = -1;
 final IPersistentMap _meta;
 String _str;
 
@@ -68,8 +67,6 @@ static public Symbol intern(String nsname){
 private Symbol(String ns_interned, String name_interned){
 	this.name = name_interned;
 	this.ns = ns_interned;
-	this.hash = Util.hashCombine(name.hashCode(), Util.hash(ns));
-	this.hasheq = Util.hashCombine(Murmur3.hashUnencodedChars(name), ns==null?0:Murmur3.hashUnencodedChars(ns));
 	this._meta = null;
 }
 
@@ -86,11 +83,14 @@ public boolean equals(Object o){
 }
 
 public int hashCode(){
-	return hash;
+	return Util.hashCombine(name.hashCode(), Util.hash(ns));
 }
 
 public int hasheq() {
-	return hasheq;
+	if(_hasheq == -1){
+		_hasheq = Util.hashCombine(Murmur3.hashUnencodedChars(name), Util.hash(ns));
+	}
+	return _hasheq;
 }
 
 public IObj withMeta(IPersistentMap meta){
@@ -101,8 +101,6 @@ private Symbol(IPersistentMap meta, String ns, String name){
 	this.name = name;
 	this.ns = ns;
 	this._meta = meta;
-	this.hash = Util.hashCombine(name.hashCode(), Util.hash(ns));
-	this.hasheq = Util.hashCombine(Murmur3.hashUnencodedChars(name), ns==null?0:Murmur3.hashUnencodedChars(ns));
 }
 
 public int compareTo(Object o){