Skip to content

Commit 73f8a47

Browse files
richhickeyrichhickey
committed
renamed IArray, AnArray
1 parent 9213607 commit 73f8a47

10 files changed

Lines changed: 32 additions & 32 deletions

src/cli/runtime/AnArray.cs renamed to src/cli/runtime/APersistentArray.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace clojure.lang
1515
{
16-
public abstract class AnArray : Obj, IArray {
16+
public abstract class APersistentArray : Obj, IPersistentArray {
1717

1818
public virtual IPersistentCollection cons(Object o) {
1919
PersistentArrayList ret = new PersistentArrayList(this, this.count() + 10);
@@ -38,7 +38,7 @@ public override Obj withMeta(IPersistentMap meta)
3838

3939
abstract public object nth(int i);
4040

41-
abstract public IArray assocN(int i, object val);
41+
abstract public IPersistentArray assocN(int i, object val);
4242

4343
#endregion
4444

src/cli/runtime/IArray.cs renamed to src/cli/runtime/IPersistentArray.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
namespace clojure.lang
1414
{
1515

16-
public interface IArray : IPersistentCollection, Associative, Sequential {
16+
public interface IPersistentArray : Associative, Sequential {
1717
int length();
1818

1919
Object nth(int i);
2020

21-
IArray assocN(int i,Object val);
21+
IPersistentArray assocN(int i,Object val);
2222
}
2323

2424
}

‎src/cli/runtime/PerisistentArrayList.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public PersistentArrayList(int initialCapacity) : base(initialCapacity){
3333
this._count = count;
3434
}
3535

36-
public PersistentArrayList(IArray init, int initialCapacity):base(init,initialCapacity){
36+
public PersistentArrayList(IPersistentArray init, int initialCapacity):base(init,initialCapacity){
3737
_count = Math.Min(init.count(),initialCapacity);
3838
}
3939

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

47-
override public IArray assocN(int i,Object val) {
47+
override public IPersistentArray assocN(int i,Object val) {
4848
if(i >= _count)
4949
throw new IndexOutOfRangeException();
5050

‎src/cli/runtime/PersistentArray.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ namespace clojure.lang
4444
* Java implementation is lock-free
4545
*/
4646

47-
public class PersistentArray : AnArray, IEnumerable
47+
public class PersistentArray : APersistentArray, IEnumerable
4848
{
4949

5050
#region IEnumerable Members
@@ -242,7 +242,7 @@ public PersistentArray(int size, ISeq seq) : this(size){
242242
data.master.load = load;
243243
}
244244

245-
public PersistentArray(IArray init) :this(init.length()) {
245+
public PersistentArray(IPersistentArray init) :this(init.length()) {
246246
int load = 0;
247247
for(int i=0;i < init.length();i++)
248248
{
@@ -253,7 +253,7 @@ public PersistentArray(IArray init) :this(init.length()) {
253253
data.master.load = load;
254254
}
255255

256-
public PersistentArray(IArray init, int size) :this(size) {
256+
public PersistentArray(IPersistentArray init, int size) :this(size) {
257257
int load = 0;
258258
for(int i=0;i < init.length() && i < size;i++)
259259
{
@@ -335,7 +335,7 @@ Entry getEntry(int i){
335335
return null;
336336
}
337337

338-
override public IArray assocN(int i,Object val) {
338+
override public IPersistentArray assocN(int i,Object val) {
339339
//if (data.master.load >= data.master.maxLoad)
340340
// {
341341
// isolate();
@@ -410,9 +410,9 @@ protected void trim(){
410410

411411
override public bool Equals(Object key){
412412
if(this == key) return true;
413-
if(key == null || !(key is IArray)) return false;
413+
if(key == null || !(key is IPersistentArray)) return false;
414414

415-
IArray a = (IArray) key;
415+
IPersistentArray a = (IPersistentArray) key;
416416

417417
if(a.length() != length())
418418
return false;
@@ -505,13 +505,13 @@ static public void Main(String[] args){
505505
ArrayList v = ArrayList.Synchronized(new ArrayList(size));
506506
//v.setSize(size);
507507
//IArray p = new PersistentArray(size);
508-
IArray p = new PersistentArrayList(size);
508+
IPersistentArray p = new PersistentArrayList(size);
509509

510510
for(int i = 0; i < size; i++)
511511
{
512512
v.Add(0);
513513
//p = p.set(i, 0);
514-
p = (IArray)((PersistentArrayList)p).cons(0);
514+
p = (IPersistentArray)((PersistentArrayList)p).cons(0);
515515
}
516516

517517
Random rand;
@@ -535,7 +535,7 @@ static public void Main(String[] args){
535535
rand = new Random(42);
536536
long tp = 0;
537537
start = DateTime.Now;
538-
IArray oldp = p;
538+
IPersistentArray oldp = p;
539539
for (int i = 0; i < writes; i++)
540540
{
541541
p = p.assocN(rand.Next(size), i);

‎src/cli/runtime/Tuple.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
namespace clojure.lang
1616
{
1717

18-
public class Tuple : AnArray{
18+
public class Tuple : APersistentArray{
1919

2020
readonly Object[] array;
2121

@@ -42,17 +42,17 @@ override public Object nth(int i){
4242
}
4343

4444

45-
override public IArray assocN(int i, Object val) {
45+
override public IPersistentArray assocN(int i, Object val) {
4646
Object[] newArray = (Object[])array.Clone();
4747
newArray[i] = val;
4848
return new Tuple(newArray);
4949
}
5050

5151
override public bool Equals(Object key){
5252
if(this == key) return true;
53-
if(key == null || !(key is IArray)) return false;
53+
if(key == null || !(key is IPersistentArray)) return false;
5454

55-
IArray a = (IArray) key;
55+
IPersistentArray a = (IPersistentArray) key;
5656

5757
if(a.length() != array.Length)
5858
return false;

src/jvm/clojure/lang/AnArray.java renamed to src/jvm/clojure/lang/APersistentArray.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
package clojure.lang;
1212

13-
public abstract class AnArray extends Obj implements IArray, Cloneable {
13+
public abstract class APersistentArray extends Obj implements IPersistentArray, Cloneable {
1414

1515
public IPersistentCollection cons(Object o) {
1616
PersistentArrayList ret = new PersistentArrayList(this, this.count() + 10);

src/jvm/clojure/lang/IArray.java renamed to src/jvm/clojure/lang/IPersistentArray.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* You must not remove this notice, or any other, from this software.
1111
*/
1212

13-
public interface IArray extends IPersistentCollection, Associative, Sequential {
13+
public interface IPersistentArray extends Associative, Sequential {
1414
int length();
1515

1616
Object nth(int i);
1717

18-
IArray assocN(int i,Object val);
18+
IPersistentArray assocN(int i,Object val);
1919
}

‎src/jvm/clojure/lang/PersistentArray.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
* I added hybrid most-recent-sequential-range + shared-bitset idea, multi-thread-safety
4747
*/
4848

49-
public class PersistentArray extends AnArray implements Iterable {
49+
public class PersistentArray extends APersistentArray implements Iterable {
5050

5151
public Iterator iterator(){
5252
return new ValIter(this);
@@ -217,7 +217,7 @@ public PersistentArray(int size, ISeq seq) throws Exception {
217217
data.master.load = load;
218218
}
219219

220-
public PersistentArray(IArray init) {
220+
public PersistentArray(IPersistentArray init) {
221221
this(init.length());
222222
int load = 0;
223223
for(int i=0;i < init.length();i++)
@@ -229,7 +229,7 @@ public PersistentArray(IArray init) {
229229
data.master.load = load;
230230
}
231231

232-
public PersistentArray(IArray init, int size) {
232+
public PersistentArray(IPersistentArray init, int size) {
233233
this(size);
234234
int load = 0;
235235
for(int i=0;i < init.length() && i < size;i++)
@@ -386,9 +386,9 @@ protected void trim(){
386386

387387
public boolean equals(Object key){
388388
if(this == key) return true;
389-
if(key == null || !(key instanceof IArray)) return false;
389+
if(key == null || !(key instanceof IPersistentArray)) return false;
390390

391-
final IArray a = (IArray) key;
391+
final IPersistentArray a = (IPersistentArray) key;
392392

393393
if(a.length() != length())
394394
return false;

‎src/jvm/clojure/lang/PersistentArrayList.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public PersistentArrayList(int initialCapacity){
3131
this._count = count;
3232
}
3333

34-
public PersistentArrayList(IArray init, int initialCapacity){
34+
public PersistentArrayList(IPersistentArray init, int initialCapacity){
3535
super(init,initialCapacity);
3636
_count = Math.min(init.count(),initialCapacity);
3737
}

‎src/jvm/clojure/lang/Tuple.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
package clojure.lang;
1414

15-
public class Tuple extends AnArray{
15+
public class Tuple extends APersistentArray {
1616

1717
final Object[] array;
1818

@@ -39,17 +39,17 @@ public Object nth(int i){
3939
}
4040

4141

42-
public IArray assocN(int i, Object val) {
42+
public IPersistentArray assocN(int i, Object val) {
4343
Object[] newArray = array.clone();
4444
newArray[i] = val;
4545
return new Tuple(newArray);
4646
}
4747

4848
public boolean equals(Object key){
4949
if(this == key) return true;
50-
if(key == null || !(key instanceof IArray)) return false;
50+
if(key == null || !(key instanceof IPersistentArray)) return false;
5151

52-
final IArray a = (IArray) key;
52+
final IPersistentArray a = (IPersistentArray) key;
5353

5454
if(a.length() != array.length)
5555
return false;

0 commit comments

Comments
 (0)