diff options
| -rw-r--r-- | src/org/clojure/runtime/PersistentArrayIdentityMap.java (renamed from src/org/clojure/runtime/PersistentIdentityArrayMap.java) | 6 | ||||
| -rw-r--r-- | src/org/clojure/runtime/PersistentHashtableIdentityMap.java (renamed from src/org/clojure/runtime/PersistentIdentityHashtableMap.java) | 24 | ||||
| -rw-r--r-- | src/org/clojure/runtime/PersistentHybridIdentityMap.java | 8 | ||||
| -rw-r--r-- | src/org/clojure/runtime/PersistentListIdentityMap.java (renamed from src/org/clojure/runtime/PersistentIdentityListMap.java) | 42 |
4 files changed, 40 insertions, 40 deletions
diff --git a/src/org/clojure/runtime/PersistentIdentityArrayMap.java b/src/org/clojure/runtime/PersistentArrayIdentityMap.java index 2e17cb4d..8db6f2a7 100644 --- a/src/org/clojure/runtime/PersistentIdentityArrayMap.java +++ b/src/org/clojure/runtime/PersistentArrayIdentityMap.java @@ -13,11 +13,11 @@ package org.clojure.runtime; /**
* ArrayMap using identity (==) comparison instead of equals
*/
-public class PersistentIdentityArrayMap extends PersistentArrayMap {
-public PersistentIdentityArrayMap() {
+public class PersistentArrayIdentityMap extends PersistentArrayMap {
+public PersistentArrayIdentityMap() {
}
-public PersistentIdentityArrayMap(Object[] init) {
+public PersistentArrayIdentityMap(Object[] init) {
super(init);
}
diff --git a/src/org/clojure/runtime/PersistentIdentityHashtableMap.java b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java index 1cbf2749..8935493c 100644 --- a/src/org/clojure/runtime/PersistentIdentityHashtableMap.java +++ b/src/org/clojure/runtime/PersistentHashtableIdentityMap.java @@ -12,17 +12,17 @@ package org.clojure.runtime; import java.util.Iterator;
-public class PersistentIdentityHashtableMap extends PersistentHashtableMap {
+public class PersistentHashtableIdentityMap extends PersistentHashtableMap {
-public PersistentIdentityHashtableMap(int initialCapacity) {
+public PersistentHashtableIdentityMap(int initialCapacity) {
super(initialCapacity);
}
-public PersistentIdentityHashtableMap(Object[] init) {
+public PersistentHashtableIdentityMap(Object[] init) {
super(init);
}
-PersistentIdentityHashtableMap(int count, PersistentArray array) {
+PersistentHashtableIdentityMap(int count, PersistentArray array) {
super(count, array);
}
@@ -35,7 +35,7 @@ public Iterator<IMapEntry> iterator() { static class Iter implements Iterator{
PersistentArray buckets;
int b;
- PersistentIdentityListMap e;
+ PersistentListIdentityMap e;
Iter(PersistentArray buckets){
this.buckets = buckets;
@@ -47,8 +47,8 @@ static class Iter implements Iterator{ e = null;
for(b = b+1;b<buckets.length();b++)
{
- PersistentIdentityListMap a = (PersistentIdentityListMap) buckets.get(b);
- if(a != null && a != PersistentIdentityListMap.EMPTY)
+ PersistentListIdentityMap a = (PersistentListIdentityMap) buckets.get(b);
+ if(a != null && a != PersistentListIdentityMap.EMPTY)
{
e = a;
break;
@@ -61,9 +61,9 @@ static class Iter implements Iterator{ }
public Object next() {
- PersistentIdentityListMap ret = e;
+ PersistentListIdentityMap ret = e;
e = e.rest();
- if(e == PersistentIdentityListMap.EMPTY)
+ if(e == PersistentListIdentityMap.EMPTY)
nextBucket();
return ret;
}
@@ -74,15 +74,15 @@ static class Iter implements Iterator{ }
IPersistentMap create(int capacity) {
- return new PersistentIdentityHashtableMap(capacity);
+ return new PersistentHashtableIdentityMap(capacity);
}
IPersistentMap create(int count, PersistentArray array) {
- return new PersistentIdentityHashtableMap(count, array);
+ return new PersistentHashtableIdentityMap(count, array);
}
IPersistentMap createListMap(Object key, Object val){
- return PersistentIdentityListMap.create(key,val);
+ return PersistentListIdentityMap.create(key,val);
}
}
diff --git a/src/org/clojure/runtime/PersistentHybridIdentityMap.java b/src/org/clojure/runtime/PersistentHybridIdentityMap.java index d3d6b743..6ea9aa2f 100644 --- a/src/org/clojure/runtime/PersistentHybridIdentityMap.java +++ b/src/org/clojure/runtime/PersistentHybridIdentityMap.java @@ -29,19 +29,19 @@ public IPersistentMap create(IPersistentMap impl) { }
public PersistentArrayMap createArrayMap(Object[] init) {
- return new PersistentIdentityArrayMap(init);
+ return new PersistentArrayIdentityMap(init);
}
IPersistentMap createArrayMap() {
- return new PersistentIdentityArrayMap();
+ return new PersistentArrayIdentityMap();
}
IPersistentMap createHashtableMap(Object[] init) {
- return new PersistentIdentityHashtableMap(init);
+ return new PersistentHashtableIdentityMap(init);
}
IPersistentMap createHashtableMap(int initialCapacity) {
- return new PersistentIdentityHashtableMap(initialCapacity);
+ return new PersistentHashtableIdentityMap(initialCapacity);
}
}
diff --git a/src/org/clojure/runtime/PersistentIdentityListMap.java b/src/org/clojure/runtime/PersistentListIdentityMap.java index 36d77336..6248e585 100644 --- a/src/org/clojure/runtime/PersistentIdentityListMap.java +++ b/src/org/clojure/runtime/PersistentListIdentityMap.java @@ -28,12 +28,12 @@ import java.util.Iterator; * code duplication here is kind of gross, but most efficient
*/
-public class PersistentIdentityListMap implements IPersistentMap, IMapEntry
+public class PersistentListIdentityMap implements IPersistentMap, IMapEntry
{
-static public PersistentIdentityListMap EMPTY = new PersistentIdentityListMap();
+static public PersistentListIdentityMap EMPTY = new PersistentListIdentityMap();
-static public PersistentIdentityListMap create(Object key, Object val){
+static public PersistentListIdentityMap create(Object key, Object val){
return new Tail(key, val);
}
@@ -45,7 +45,7 @@ public Object val(){ return null;
}
-PersistentIdentityListMap rest(){
+PersistentListIdentityMap rest(){
return this;
}
@@ -65,11 +65,11 @@ public IPersistentMap add(Object key){ return put(key, null);
}
-public PersistentIdentityListMap put(Object key, Object val){
+public PersistentListIdentityMap put(Object key, Object val){
return new Tail(key, val);
}
-public PersistentIdentityListMap remove(Object key){
+public PersistentListIdentityMap remove(Object key){
return this;
}
@@ -82,9 +82,9 @@ public int capacity(){ }
static class Iter implements Iterator{
- PersistentIdentityListMap e;
+ PersistentListIdentityMap e;
- Iter(PersistentIdentityListMap e)
+ Iter(PersistentListIdentityMap e)
{
this.e = e;
}
@@ -94,7 +94,7 @@ static class Iter implements Iterator{ }
public Object next(){
- PersistentIdentityListMap ret = e;
+ PersistentListIdentityMap ret = e;
e = e.rest();
return ret;
}
@@ -108,7 +108,7 @@ public Iterator iterator(){ return new Iter(this);
}
-static class Tail extends PersistentIdentityListMap {
+static class Tail extends PersistentListIdentityMap {
final Object _key;
final Object _val;
@@ -117,7 +117,7 @@ static class Tail extends PersistentIdentityListMap { this._val = val;
}
- PersistentIdentityListMap rest(){
+ PersistentListIdentityMap rest(){
return EMPTY;
}
@@ -153,7 +153,7 @@ static class Tail extends PersistentIdentityListMap { return null;
}
- public PersistentIdentityListMap put(Object key, Object val){
+ public PersistentListIdentityMap put(Object key, Object val){
if(key == _key) //replace
{
if(val == _val)
@@ -163,19 +163,19 @@ static class Tail extends PersistentIdentityListMap { return new Link(key,val,this);
}
- public PersistentIdentityListMap remove(Object key){
+ public PersistentListIdentityMap remove(Object key){
if(key == _key)
return EMPTY;
return this;
}
}
-static class Link extends PersistentIdentityListMap {
+static class Link extends PersistentListIdentityMap {
final Object _key;
final Object _val;
- final PersistentIdentityListMap _rest;
+ final PersistentListIdentityMap _rest;
- Link(Object key,Object val,PersistentIdentityListMap rest){
+ Link(Object key,Object val,PersistentListIdentityMap rest){
this._key = key;
this._val = val;
this._rest = rest;
@@ -189,7 +189,7 @@ static class Link extends PersistentIdentityListMap { return _val;
}
- PersistentIdentityListMap rest(){
+ PersistentListIdentityMap rest(){
return _rest;
}
@@ -207,7 +207,7 @@ static class Link extends PersistentIdentityListMap { return _rest.find(key);
}
- public PersistentIdentityListMap put(Object key, Object val){
+ public PersistentListIdentityMap put(Object key, Object val){
IMapEntry e = find(key);
if(e != null)
{
@@ -218,10 +218,10 @@ static class Link extends PersistentIdentityListMap { return new Link(key,val,this);
}
- public PersistentIdentityListMap remove(Object key){
+ public PersistentListIdentityMap remove(Object key){
if(key == _key)
return _rest;
- PersistentIdentityListMap r = _rest.remove(key);
+ PersistentListIdentityMap r = _rest.remove(key);
if(r == _rest) //not there
return this;
return create(_key,_val,r);
@@ -238,7 +238,7 @@ static class Link extends PersistentIdentityListMap { return count();
}
- PersistentIdentityListMap create(Object k,Object v,PersistentIdentityListMap r){
+ PersistentListIdentityMap create(Object k,Object v,PersistentListIdentityMap r){
if(r == EMPTY)
return new Tail(k,v);
return new Link(k, v, r);
|