More string interning stuff

Author: mikera

convex-core/src/main/java/convex/core/data/Strings.java

@@ -24,16 +24,19 @@ public class Strings {
 
 	public static final Ref<StringShort> EMPTY_REF = EMPTY.getRef();
 
-	public static final StringShort NIL = StringShort.create("nil");
-	public static final StringShort TRUE = StringShort.create(CVMBool.TRUE_STRING);
-	public static final StringShort FALSE = StringShort.create(CVMBool.FALSE_STRING);
+	public static final StringShort NIL = StringShort.intern("nil");
+	public static final StringShort TRUE = StringShort.intern(CVMBool.TRUE_STRING);
+	public static final StringShort FALSE = StringShort.intern(CVMBool.FALSE_STRING);
+	
+	public static final StringShort SPACE = StringShort.intern(" ");
+	public static final StringShort COLON = StringShort.intern(":");
+	public static final StringShort HEX_PREFIX = StringShort.intern("0x");
+
 
 	public static final StringShort BAD_SIGNATURE = StringShort.create("Bad Signature!");
 	public static final StringShort BAD_FORMAT = StringShort.create("Bad Message Format!");
 	public static final StringShort SERVER_LOADED = StringShort.create("Trx overload");
 
-	public static final StringShort COLON = StringShort.intern(":");
-	public static final StringShort HEX_PREFIX = StringShort.intern("0x");
 
 	public static final int MAX_ENCODING_LENGTH = Math.max(StringShort.MAX_ENCODING_LENGTH,StringTree.MAX_ENCODING_LENGTH);
 
@@ -70,7 +73,7 @@ public class Strings {
 
 	public static final StringShort FULL_BUFFER = StringShort.create("Buffer full");
 
-	public static final StringShort NULL = StringShort.create("null");
+	public static final StringShort NULL = StringShort.intern("null");
 
 
 	public static final Comparator<AString> lengthComparator = (a,b)->{

convex-core/src/main/java/convex/core/data/Symbol.java

@@ -1,7 +1,5 @@
 package convex.core.data;
 
-import java.util.WeakHashMap;
-
 import convex.core.data.impl.StringStore;
 import convex.core.data.type.AType;
 import convex.core.data.type.Types;
@@ -36,8 +34,6 @@ private Symbol(StringShort name) {
 	public AType getType() {
 		return Types.SYMBOL;
 	}
-	
-	protected static final WeakHashMap<AString,Symbol> cache=new WeakHashMap<>(100);
 
 	/**
 	 * Creates a Symbol with the given name
@@ -61,13 +57,7 @@ public static Symbol create(AString name) {
 		if (!validateName(name)) return null;
 
 		Symbol sym= new Symbol((StringShort)name);
-		
-		synchronized (cache) {
-			// TODO: figure out if caching Symbols is a net win or not
-			Symbol cached=cache.get(name);
-			if (cached!=null) return cached;
-			cache.put(name,sym);
-		}
+	
 
 		return sym;
 	}

convex-core/src/main/java/convex/core/data/impl/StringStore.java

@@ -18,6 +18,12 @@
  * Don't use this for anything sent in externally!
  */
 public class StringStore {
+	
+	
+	static HashMap<String,Entry> stringIndex=new HashMap<>();
+	
+	static HashMap<Blob,Entry> blobIndex=new HashMap<>();
+
 
 	public static class Entry {
 		String string=null;
@@ -73,10 +79,6 @@ public Symbol getSymbol() {
 			return result;
 		}
 	}
-	
-	static HashMap<String,Entry> stringIndex=new HashMap<>();
-	
-	static HashMap<Blob,Entry> blobIndex=new HashMap<>();
 
 
 	public static Entry get(String string) {