summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/org/clojure/runtime/PersistentHashtableIdentityMap.java8
-rw-r--r--src/org/clojure/runtime/PersistentHashtableMap.java2
-rw-r--r--src/org/clojure/runtime/PersistentTree.java10
3 files changed, 14 insertions, 6 deletions
diff --git a/src/org/clojure/runtime/PersistentHashtableIdentityMap.java b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
index 8935493c..4cf7ebe9 100644
--- a/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
+++ b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java
@@ -26,6 +26,10 @@ PersistentHashtableIdentityMap(int count, PersistentArray array) {
super(count, array);
}
+PersistentHashtableIdentityMap(int i, PersistentArray newArray, int growAtCount) {
+ super(i, newArray, growAtCount);
+}
+
public Iterator<IMapEntry> iterator() {
return new Iter(array);
@@ -81,6 +85,10 @@ IPersistentMap create(int count, PersistentArray array) {
return new PersistentHashtableIdentityMap(count, array);
}
+IPersistentMap create(int i, PersistentArray newArray, int growAtCount){
+ return new PersistentHashtableIdentityMap(i, newArray, growAtCount);
+}
+
IPersistentMap createListMap(Object key, Object val){
return PersistentListIdentityMap.create(key,val);
}
diff --git a/src/org/clojure/runtime/PersistentHashtableMap.java b/src/org/clojure/runtime/PersistentHashtableMap.java
index 7a6b5f21..78632662 100644
--- a/src/org/clojure/runtime/PersistentHashtableMap.java
+++ b/src/org/clojure/runtime/PersistentHashtableMap.java
@@ -141,7 +141,7 @@ IPersistentMap grow(){
return create(_count,newArray);
}
-public Iterator<IMapEntry> iterator() {
+public Iterator iterator() {
return new Iter(array);
}
diff --git a/src/org/clojure/runtime/PersistentTree.java b/src/org/clojure/runtime/PersistentTree.java
index 5c6a099f..618d25f5 100644
--- a/src/org/clojure/runtime/PersistentTree.java
+++ b/src/org/clojure/runtime/PersistentTree.java
@@ -678,11 +678,11 @@ static public void main(String args[]){
//force the ListMap class loading now
PersistentListMap.EMPTY.add(1).add(2).add(3);
System.out.println("Building set");
- IPersistentMap set = new PersistentHybridMap(1001);
- //IMap set = new HashtableMap(1001);
- //IMap set = new ListMap();
- //IMap set = new ArrayMap();
- //IMap set = new RBTree();
+ //IPersistentMap set = new PersistentHybridMap(1001);
+ IPersistentMap set = new PersistentHashtableMap(1001);
+ //IPersistentMap set = new ListMap();
+ //IPersistentMap set = new ArrayMap();
+ //IPersistentMap set = new RBTree();
// for(int i = 0; i < ints.length; i++)
// {
// Integer anInt = ints[i];