summaryrefslogtreecommitdiff
path: root/src/jvm
diff options
context:
space:
mode:
Diffstat (limited to 'src/jvm')
-rw-r--r--src/jvm/clojure/lang/APersistentArray.java (renamed from src/jvm/clojure/lang/AnArray.java)2
-rw-r--r--src/jvm/clojure/lang/IPersistentArray.java (renamed from src/jvm/clojure/lang/IArray.java)4
-rw-r--r--src/jvm/clojure/lang/PersistentArray.java10
-rw-r--r--src/jvm/clojure/lang/PersistentArrayList.java2
-rw-r--r--src/jvm/clojure/lang/Tuple.java8
5 files changed, 13 insertions, 13 deletions
diff --git a/src/jvm/clojure/lang/AnArray.java b/src/jvm/clojure/lang/APersistentArray.java
index 66d5e614..bd5300d4 100644
--- a/src/jvm/clojure/lang/AnArray.java
+++ b/src/jvm/clojure/lang/APersistentArray.java
@@ -10,7 +10,7 @@
package clojure.lang;
-public abstract class AnArray extends Obj implements IArray, Cloneable {
+public abstract class APersistentArray extends Obj implements IPersistentArray, Cloneable {
public IPersistentCollection cons(Object o) {
PersistentArrayList ret = new PersistentArrayList(this, this.count() + 10);
diff --git a/src/jvm/clojure/lang/IArray.java b/src/jvm/clojure/lang/IPersistentArray.java
index c54b109f..0ca0a880 100644
--- a/src/jvm/clojure/lang/IArray.java
+++ b/src/jvm/clojure/lang/IPersistentArray.java
@@ -10,10 +10,10 @@ package clojure.lang;
* You must not remove this notice, or any other, from this software.
*/
-public interface IArray extends IPersistentCollection, Associative, Sequential {
+public interface IPersistentArray extends Associative, Sequential {
int length();
Object nth(int i);
-IArray assocN(int i,Object val);
+IPersistentArray assocN(int i,Object val);
}
diff --git a/src/jvm/clojure/lang/PersistentArray.java b/src/jvm/clojure/lang/PersistentArray.java
index 64130538..e0673e8e 100644
--- a/src/jvm/clojure/lang/PersistentArray.java
+++ b/src/jvm/clojure/lang/PersistentArray.java
@@ -46,7 +46,7 @@ import java.util.Random;
* I added hybrid most-recent-sequential-range + shared-bitset idea, multi-thread-safety
*/
-public class PersistentArray extends AnArray implements Iterable {
+public class PersistentArray extends APersistentArray implements Iterable {
public Iterator iterator(){
return new ValIter(this);
@@ -217,7 +217,7 @@ public PersistentArray(int size, ISeq seq) throws Exception {
data.master.load = load;
}
-public PersistentArray(IArray init) {
+public PersistentArray(IPersistentArray init) {
this(init.length());
int load = 0;
for(int i=0;i < init.length();i++)
@@ -229,7 +229,7 @@ public PersistentArray(IArray init) {
data.master.load = load;
}
-public PersistentArray(IArray init, int size) {
+public PersistentArray(IPersistentArray init, int size) {
this(size);
int load = 0;
for(int i=0;i < init.length() && i < size;i++)
@@ -386,9 +386,9 @@ protected void trim(){
public boolean equals(Object key){
if(this == key) return true;
- if(key == null || !(key instanceof IArray)) return false;
+ if(key == null || !(key instanceof IPersistentArray)) return false;
- final IArray a = (IArray) key;
+ final IPersistentArray a = (IPersistentArray) key;
if(a.length() != length())
return false;
diff --git a/src/jvm/clojure/lang/PersistentArrayList.java b/src/jvm/clojure/lang/PersistentArrayList.java
index eeb045b2..538cfe07 100644
--- a/src/jvm/clojure/lang/PersistentArrayList.java
+++ b/src/jvm/clojure/lang/PersistentArrayList.java
@@ -31,7 +31,7 @@ PersistentArrayList(int size, Object defaultVal, float loadFactor, int count) {
this._count = count;
}
-public PersistentArrayList(IArray init, int initialCapacity){
+public PersistentArrayList(IPersistentArray init, int initialCapacity){
super(init,initialCapacity);
_count = Math.min(init.count(),initialCapacity);
}
diff --git a/src/jvm/clojure/lang/Tuple.java b/src/jvm/clojure/lang/Tuple.java
index 71ecaf8e..14093bc2 100644
--- a/src/jvm/clojure/lang/Tuple.java
+++ b/src/jvm/clojure/lang/Tuple.java
@@ -12,7 +12,7 @@
package clojure.lang;
-public class Tuple extends AnArray{
+public class Tuple extends APersistentArray {
final Object[] array;
@@ -39,7 +39,7 @@ public Object nth(int i){
}
-public IArray assocN(int i, Object val) {
+public IPersistentArray assocN(int i, Object val) {
Object[] newArray = array.clone();
newArray[i] = val;
return new Tuple(newArray);
@@ -47,9 +47,9 @@ public IArray assocN(int i, Object val) {
public boolean equals(Object key){
if(this == key) return true;
- if(key == null || !(key instanceof IArray)) return false;
+ if(key == null || !(key instanceof IPersistentArray)) return false;
- final IArray a = (IArray) key;
+ final IPersistentArray a = (IPersistentArray) key;
if(a.length() != array.length)
return false;