more uniform map literal implementation

2 files changed, 2 insertions, 2 deletions

diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index 765c4a9f..bb62536a 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -2429,7 +2429,7 @@ static public String munge(String name){
 
 public static class EmptyExpr implements Expr{
 	public final Object coll;
-	final static Type HASHMAP_TYPE = Type.getType(PersistentHashMap.class);
+	final static Type HASHMAP_TYPE = Type.getType(PersistentArrayMap.class);
 	final static Type HASHSET_TYPE = Type.getType(PersistentHashSet.class);
 	final static Type VECTOR_TYPE = Type.getType(PersistentVector.class);
 	final static Type LIST_TYPE = Type.getType(PersistentList.class);
diff --git a/src/jvm/clojure/lang/LispReader.java b/src/jvm/clojure/lang/LispReader.java
index 30c7e89d..db4424cf 100644
--- a/src/jvm/clojure/lang/LispReader.java
+++ b/src/jvm/clojure/lang/LispReader.java
@@ -943,7 +943,7 @@ public static class VectorReader extends AFn{
 public static class MapReader extends AFn{

 	public Object invoke(Object reader, Object leftparen) throws Exception{

 		PushbackReader r = (PushbackReader) reader;

-		return PersistentHashMap.create(readDelimitedList('}', r, true));

+		return RT.map(readDelimitedList('}', r, true).toArray());

 	}

 

 }