renamed IArray, AnArray

10 files changed, 32 insertions, 32 deletions

diff --git a/src/cli/runtime/AnArray.cs b/src/cli/runtime/APersistentArray.cs
index b02f7c65..fe6a42f5 100644
--- a/src/cli/runtime/AnArray.cs
+++ b/src/cli/runtime/APersistentArray.cs
@@ -13,7 +13,7 @@ using System.Collections;
 

 namespace clojure.lang

 {

-public abstract class AnArray : Obj, IArray {

+public abstract class APersistentArray : Obj, IPersistentArray {

 

 public virtual IPersistentCollection cons(Object o) {

     PersistentArrayList ret = new PersistentArrayList(this, this.count() + 10);

@@ -38,7 +38,7 @@ public virtual IPersistentCollection cons(Object o) {
 

 	abstract public object nth(int i);

 

-	abstract public IArray assocN(int i, object val);

+	abstract public IPersistentArray assocN(int i, object val);

 

 	#endregion

 

diff --git a/src/cli/runtime/IArray.cs b/src/cli/runtime/IPersistentArray.cs
index 09e1bbe6..77e6290c 100644
--- a/src/cli/runtime/IArray.cs
+++ b/src/cli/runtime/IPersistentArray.cs
@@ -13,12 +13,12 @@ using System;
 namespace clojure.lang

 {
 

-public interface IArray : IPersistentCollection, Associative, Sequential {

+public interface IPersistentArray : Associative, Sequential {

 int length();

 

 Object nth(int i);

 

-IArray assocN(int i,Object val);

+IPersistentArray assocN(int i,Object val);

 }

 

 }

diff --git a/src/cli/runtime/PerisistentArrayList.cs b/src/cli/runtime/PerisistentArrayList.cs
index 6753f4f1..3c71312a 100644
--- a/src/cli/runtime/PerisistentArrayList.cs
+++ b/src/cli/runtime/PerisistentArrayList.cs
@@ -33,7 +33,7 @@ PersistentArrayList(int size, Object defaultVal, float loadFactor, int count):ba
     this._count = count;

 }

 

-public PersistentArrayList(IArray init, int initialCapacity):base(init,initialCapacity){

+public PersistentArrayList(IPersistentArray init, int initialCapacity):base(init,initialCapacity){

     _count = Math.Min(init.count(),initialCapacity);

 }

 

@@ -44,7 +44,7 @@ override public Object nth(int i) {
     return base.nth(i);

 }

 

-override public IArray assocN(int i,Object val) {

+override public IPersistentArray assocN(int i,Object val) {

     if(i >= _count)

 		throw new IndexOutOfRangeException();

 

diff --git a/src/cli/runtime/PersistentArray.cs b/src/cli/runtime/PersistentArray.cs
index f1e3fef5..8177a4b4 100644
--- a/src/cli/runtime/PersistentArray.cs
+++ b/src/cli/runtime/PersistentArray.cs
@@ -44,7 +44,7 @@ namespace clojure.lang
  * Java implementation is lock-free

  */

 

-	public class PersistentArray : AnArray, IEnumerable

+	public class PersistentArray : APersistentArray, IEnumerable

 		{

 

 	#region IEnumerable Members

@@ -242,7 +242,7 @@ public PersistentArray(int size, ISeq seq) : this(size){
 	data.master.load = load;

 }

 

-public PersistentArray(IArray init) :this(init.length()) {

+public PersistentArray(IPersistentArray init) :this(init.length()) {

     int load = 0;

     for(int i=0;i < init.length();i++)

         {

@@ -253,7 +253,7 @@ public PersistentArray(IArray init) :this(init.length()) {
 	data.master.load = load;

 }

 

-public PersistentArray(IArray init, int size) :this(size) {

+public PersistentArray(IPersistentArray init, int size) :this(size) {

     int load = 0;

     for(int i=0;i < init.length() && i < size;i++)

         {

@@ -335,7 +335,7 @@ for (Entry e = (Entry)data.master.array[i]; e != null; e = e.rest())
 	return null;

 }

 

-override public IArray assocN(int i,Object val) {

+override public IPersistentArray assocN(int i,Object val) {

 //if (data.master.load >= data.master.maxLoad)

 //		{

 //		isolate();

@@ -410,9 +410,9 @@ protected void trim(){
 

 override public bool Equals(Object key){

     if(this == key) return true;

-    if(key == null || !(key is IArray)) return false;

+    if(key == null || !(key is IPersistentArray)) return false;

 

-    IArray a = (IArray) key;

+    IPersistentArray a = (IPersistentArray) key;

 

     if(a.length() != length())

         return false;

@@ -505,13 +505,13 @@ static public void Main(String[] args){
 	ArrayList v = ArrayList.Synchronized(new ArrayList(size));

 	//v.setSize(size);

 	//IArray p = new PersistentArray(size);

-	IArray p = new PersistentArrayList(size);

+	IPersistentArray p = new PersistentArrayList(size);

 

 	for(int i = 0; i < size; i++)

 		{

 		v.Add(0);

 		//p = p.set(i, 0);

-		p = (IArray)((PersistentArrayList)p).cons(0);

+		p = (IPersistentArray)((PersistentArrayList)p).cons(0);

 		}

 

 	Random rand;

@@ -535,7 +535,7 @@ static public void Main(String[] args){
 	rand = new Random(42);

 	long tp = 0;

 	start = DateTime.Now;

-	IArray oldp = p;

+	IPersistentArray oldp = p;

 	for (int i = 0; i < writes; i++)

 		{

 		p =	p.assocN(rand.Next(size), i);

diff --git a/src/cli/runtime/Tuple.cs b/src/cli/runtime/Tuple.cs
index fa6dfda1..24f7f760 100644
--- a/src/cli/runtime/Tuple.cs
+++ b/src/cli/runtime/Tuple.cs
@@ -15,7 +15,7 @@ using System;
 namespace clojure.lang

 {
 

-public class Tuple : AnArray{

+public class Tuple : APersistentArray{

 

 readonly Object[] array;

 

@@ -42,7 +42,7 @@ override public Object nth(int i){
 }

 

 

-override public IArray assocN(int i, Object val) {

+override public IPersistentArray assocN(int i, Object val) {

 	Object[] newArray = (Object[])array.Clone();

 	newArray[i] = val;

     return new Tuple(newArray);

@@ -50,9 +50,9 @@ override public IArray assocN(int i, Object val) {
 

 override public bool Equals(Object key){

     if(this == key) return true;

-    if(key == null || !(key is IArray)) return false;

+    if(key == null || !(key is IPersistentArray)) return false;

 

-    IArray a = (IArray) key;

+    IPersistentArray a = (IPersistentArray) key;

 

     if(a.length() != array.Length)

         return false;

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;