renamed IPersistentArray to IPersistentVector

7 files changed, 31 insertions, 31 deletions

diff --git a/src/jvm/clojure/lang/ArgVector.java b/src/jvm/clojure/lang/ArgVector.java
index 699662ed..7e18310c 100644
--- a/src/jvm/clojure/lang/ArgVector.java
+++ b/src/jvm/clojure/lang/ArgVector.java
@@ -14,7 +14,7 @@ package clojure.lang;
 
 import java.util.List;
 
-public class ArgVector extends Obj implements IPersistentArray, IPersistentList{
+public class ArgVector extends Obj implements IPersistentVector, IPersistentList{
 
 final PersistentVector impl;
 
@@ -55,7 +55,7 @@ public Object nth(int i){
 	return impl.nth(i);
 }
 
-public IPersistentArray assocN(int i, Object val){
+public IPersistentVector assocN(int i, Object val){
 	return new ArgVector(meta(), impl.assocN(i, val));
 }
 
diff --git a/src/jvm/clojure/lang/Compiler.java b/src/jvm/clojure/lang/Compiler.java
index 2009c57d..24c170f0 100644
--- a/src/jvm/clojure/lang/Compiler.java
+++ b/src/jvm/clojure/lang/Compiler.java
@@ -425,7 +425,7 @@ static class StaticFieldExpr extends FieldExpr implements AssignableExpr{
 }
 
 static abstract class MethodExpr extends HostExpr{
-	static void emitArgsAsArray(IPersistentArray args, FnExpr fn, GeneratorAdapter gen){
+	static void emitArgsAsArray(IPersistentVector args, FnExpr fn, GeneratorAdapter gen){
 		gen.push(args.count());
 		gen.newArray(OBJECT_TYPE);
 		for(int i = 0; i < args.count(); i++)
@@ -441,12 +441,12 @@ static abstract class MethodExpr extends HostExpr{
 static class InstanceMethodExpr extends MethodExpr{
 	final Expr target;
 	final String methodName;
-	final IPersistentArray args;
+	final IPersistentVector args;
 	final static Method invokeInstanceMethodMethod =
 			Method.getMethod("Object invokeInstanceMethod(Object,String,Object[])");
 
 
-	public InstanceMethodExpr(Expr target, String methodName, IPersistentArray args){
+	public InstanceMethodExpr(Expr target, String methodName, IPersistentVector args){
 		this.args = args;
 		this.methodName = methodName;
 		this.target = target;
@@ -473,12 +473,12 @@ static class InstanceMethodExpr extends MethodExpr{
 static class StaticMethodExpr extends MethodExpr{
 	final String className;
 	final String methodName;
-	final IPersistentArray args;
+	final IPersistentVector args;
 	final static Method invokeStaticMethodMethod =
 			Method.getMethod("Object invokeStaticMethod(String,String,Object[])");
 
 
-	public StaticMethodExpr(String className, String methodName, IPersistentArray args){
+	public StaticMethodExpr(String className, String methodName, IPersistentVector args){
 		this.className = className;
 		this.methodName = methodName;
 		this.args = args;
@@ -925,10 +925,10 @@ static String munge(String name){
 
 static class InvokeExpr implements Expr{
 	final Expr fexpr;
-	final IPersistentArray args;
+	final IPersistentVector args;
 
 
-	public InvokeExpr(Expr fexpr, IPersistentArray args){
+	public InvokeExpr(Expr fexpr, IPersistentVector args){
 		this.fexpr = fexpr;
 		this.args = args;
 	}
@@ -1008,7 +1008,7 @@ static class FnExpr implements Expr{
 							VARS, PersistentHashMap.EMPTY));
 			//(fn [args] body...) or (fn ([args] body...) ([args2] body2...) ...)
 			//turn former into latter
-			if(RT.second(form) instanceof IPersistentArray)
+			if(RT.second(form) instanceof IPersistentVector)
 				form = RT.list(FN, RT.rest(form));
 
 			FnMethod[] methodArray = new FnMethod[MAX_POSITIONAL_ARITY + 1];
@@ -1234,7 +1234,7 @@ static class FnMethod{
 
 	private static FnMethod parse(FnExpr fn, ISeq form) throws Exception{
 		//([args] body...)
-		IPersistentArray parms = (IPersistentArray) RT.first(form);
+		IPersistentVector parms = (IPersistentVector) RT.first(form);
 		ISeq body = RT.rest(form);
 		try
 			{
@@ -1427,10 +1427,10 @@ static class LetExpr implements Expr{
 
 	static Expr parse(C context, ISeq form, boolean isLoop) throws Exception{
 		//(let [var val var2 val2 ...] body...)
-		if(!(RT.second(form) instanceof IPersistentArray))
+		if(!(RT.second(form) instanceof IPersistentVector))
 			throw new IllegalArgumentException("Bad binding form, expected vector");
 
-		IPersistentArray bindings = (IPersistentArray) RT.second(form);
+		IPersistentVector bindings = (IPersistentVector) RT.second(form);
 		if((bindings.count() % 2) != 0)
 			throw new IllegalArgumentException("Bad binding form, expected matched symbol expression pairs");
 
@@ -1505,10 +1505,10 @@ static class LetExpr implements Expr{
 }
 
 static class RecurExpr implements Expr{
-	final IPersistentArray args;
-	final IPersistentArray loopLocals;
+	final IPersistentVector args;
+	final IPersistentVector loopLocals;
 
-	public RecurExpr(IPersistentArray loopLocals, IPersistentArray args){
+	public RecurExpr(IPersistentVector loopLocals, IPersistentVector args){
 		this.loopLocals = loopLocals;
 		this.args = args;
 	}
@@ -1533,7 +1533,7 @@ static class RecurExpr implements Expr{
 	}
 
 	public static Expr parse(C context, ISeq form) throws Exception{
-		IPersistentArray loopLocals = (IPersistentArray) LOOP_LOCALS.get();
+		IPersistentVector loopLocals = (IPersistentVector) LOOP_LOCALS.get();
 		if(context != C.RETURN || loopLocals == null)
 			throw new UnsupportedOperationException("Can only recur from tail position");
 		PersistentVector args = PersistentVector.EMPTY;
diff --git a/src/jvm/clojure/lang/IPersistentArray.java b/src/jvm/clojure/lang/IPersistentVector.java
index 0ca0a880..971fb318 100644
--- a/src/jvm/clojure/lang/IPersistentArray.java
+++ b/src/jvm/clojure/lang/IPersistentVector.java
@@ -10,10 +10,10 @@ package clojure.lang;
  * You must not remove this notice, or any other, from this software.

  */

 

-public interface IPersistentArray extends Associative, Sequential {

+public interface IPersistentVector extends Associative, Sequential{

 int length();

 

 Object nth(int i);

 

-IPersistentArray assocN(int i,Object val);

+IPersistentVector assocN(int i, Object val);

 }

diff --git a/src/jvm/clojure/lang/OldCompiler.java b/src/jvm/clojure/lang/OldCompiler.java
index a4152182..d227e609 100644
--- a/src/jvm/clojure/lang/OldCompiler.java
+++ b/src/jvm/clojure/lang/OldCompiler.java
@@ -835,7 +835,7 @@ private static Expr analyzeLetFn(C context, ISeq form) throws Exception{
 		PersistentVector bindingInits = PersistentVector.EMPTY;
 		for(int i = 0; i < bindingPairs.count(); i++)
 			{
-			IPersistentArray bpair = (IPersistentArray) bindingPairs.nth(i);
+			IPersistentVector bpair = (IPersistentVector) bindingPairs.nth(i);
 			LocalBinding lb = (LocalBinding) bpair.nth(0);
 			FnExpr fexpr = (FnExpr) analyze(C.EXPRESSION, bpair.nth(1));
 			fexpr.binding = lb;
diff --git a/src/jvm/clojure/lang/PersistentHashMap.java b/src/jvm/clojure/lang/PersistentHashMap.java
index e4c99512..1ff0d481 100644
--- a/src/jvm/clojure/lang/PersistentHashMap.java
+++ b/src/jvm/clojure/lang/PersistentHashMap.java
@@ -19,7 +19,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 
 /*
- A persistent rendition of Phil Bagwell's Ideal Hash Trees
+ A persistent rendition of Phil Bagwell's Hash Array Mapped Trie
 
  Uses path copying for persistence
  HashCollision leaves vs. extended hashing
diff --git a/src/jvm/clojure/lang/PersistentVector.java b/src/jvm/clojure/lang/PersistentVector.java
index 8e4f0973..d5f342c8 100644
--- a/src/jvm/clojure/lang/PersistentVector.java
+++ b/src/jvm/clojure/lang/PersistentVector.java
@@ -14,7 +14,7 @@ package clojure.lang;
 
 import java.util.*;
 
-public class PersistentVector extends Obj implements IPersistentArray, IPersistentList, Iterable{
+public class PersistentVector extends Obj implements IPersistentVector, IPersistentList, Iterable{
 final int cnt;
 final int shift;
 final Object[] root;
@@ -117,9 +117,9 @@ public ISeq rseq(){
 }
 
 public boolean equals(Object obj){
-	if(obj instanceof IPersistentArray)
+	if(obj instanceof IPersistentVector)
 		{
-		IPersistentArray ma = (IPersistentArray) obj;
+		IPersistentVector ma = (IPersistentVector) obj;
 		if(ma.count() != count() || ma.hashCode() != hashCode())
 			return false;
 		for(int i = 0; i < count(); i++)
diff --git a/src/jvm/clojure/lang/RT.java b/src/jvm/clojure/lang/RT.java
index 64903c65..cad52698 100644
--- a/src/jvm/clojure/lang/RT.java
+++ b/src/jvm/clojure/lang/RT.java
@@ -293,8 +293,8 @@ static public Object without(Object key, Object coll){
 static public Object nth(int n, Object coll){
 	if(coll == null)
 		return null;
-	else if(coll instanceof IPersistentArray)
-		return ((IPersistentArray) coll).nth(n);
+	else if(coll instanceof IPersistentVector)
+		return ((IPersistentVector) coll).nth(n);
 	else if(coll instanceof Object[])
 		return ((Object[]) coll)[n];
 	else if(coll instanceof Sequential)
@@ -314,8 +314,8 @@ static public Object nth(int n, Object coll){
 static public Object assocN(int n, Object val, Object coll){
 	if(coll == null)
 		return null;
-	else if(coll instanceof IPersistentArray)
-		return ((IPersistentArray) coll).assocN(n, val);
+	else if(coll instanceof IPersistentVector)
+		return ((IPersistentVector) coll).assocN(n, val);
 	else if(coll instanceof Object[])
 		{
 		//hmm... this is not persistent
@@ -435,7 +435,7 @@ static public IPersistentMap map(Object... init){
 	return PersistentHashMap.create(init);
 }
 
-static public IPersistentArray vector(Object... init){
+static public IPersistentVector vector(Object... init){
 	return PersistentVector.create(init);
 }
 
@@ -628,9 +628,9 @@ static public void print(Object x, Writer w) throws Exception{
 			}
 		w.write('}');
 		}
-	else if(x instanceof IPersistentArray)
+	else if(x instanceof IPersistentVector)
 		{
-		IPersistentArray a = (IPersistentArray) x;
+		IPersistentVector a = (IPersistentVector) x;
 		w.write('[');
 		for(int i = 0; i < a.count(); i++)
 			{