merged lazy branch -r1236:1286

38 files changed, 2275 insertions, 2128 deletions

diff --git a/src/jvm/clojure/lang/AFn.java b/src/jvm/clojure/lang/AFn.java
index bf406969..e2646ade 100644
--- a/src/jvm/clojure/lang/AFn.java
+++ b/src/jvm/clojure/lang/AFn.java
@@ -12,7 +12,6 @@
 
 package clojure.lang;
 
-import java.util.Comparator;
 import java.io.Serializable;
 
 public abstract class AFn extends Obj implements IFn, Serializable{
@@ -174,273 +173,273 @@ static public Object applyToHelper(IFn ifn, ISeq arglist) throws Exception{
 			return ifn.invoke(arglist.first());
 		case 2:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 3:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 4:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 5:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 6:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 7:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 8:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 9:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 10:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 11:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 12:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 13:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 14:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 15:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 16:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 17:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 18:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 19:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		case 20:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
 			);
 		default:
 			return ifn.invoke(arglist.first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, (arglist = arglist.rest()).first()
-					, RT.seqToArray(arglist.rest()));
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, (arglist = arglist.next()).first()
+					, RT.seqToArray(arglist.next()));
 		}
 }
 
diff --git a/src/jvm/clojure/lang/APersistentMap.java b/src/jvm/clojure/lang/APersistentMap.java
index 4d8bc8f7..743f4480 100644
--- a/src/jvm/clojure/lang/APersistentMap.java
+++ b/src/jvm/clojure/lang/APersistentMap.java
@@ -44,7 +44,7 @@ public IPersistentCollection cons(Object o){
 		}

 

 	IPersistentMap ret = this;

-	for(ISeq es = RT.seq(o); es != null; es = es.rest())

+	for(ISeq es = RT.seq(o); es != null; es = es.next())

 		{

 		Map.Entry e = (Map.Entry) es.first();

 		ret = ret.assoc(e.getKey(), e.getValue());

@@ -60,7 +60,7 @@ public boolean equals(Object obj){
 	if(m.size() != size() || m.hashCode() != hashCode())

 		return false;

 

-	for(ISeq s = seq(); s != null; s = s.rest())

+	for(ISeq s = seq(); s != null; s = s.next())

 		{

 		Map.Entry e = (Map.Entry) s.first();

 		boolean found = m.containsKey(e.getKey());

@@ -80,7 +80,7 @@ public boolean equiv(Object obj){
 	if(m.size() != size())

 		return false;

 

-	for(ISeq s = seq(); s != null; s = s.rest())

+	for(ISeq s = seq(); s != null; s = s.next())

 		{

 		Map.Entry e = (Map.Entry) s.first();

 		boolean found = m.containsKey(e.getKey());

@@ -96,7 +96,7 @@ public int hashCode(){
 		{

 		//int hash = count();

 		int hash = 0;

-		for(ISeq s = seq(); s != null; s = s.rest())

+		for(ISeq s = seq(); s != null; s = s.next())

 			{

 			Map.Entry e = (Map.Entry) s.first();

 			hash += (e.getKey() == null ? 0 : e.getKey().hashCode()) ^

@@ -130,8 +130,8 @@ static public class KeySeq extends ASeq{
 		return ((Map.Entry) seq.first()).getKey();

 	}

 

-	public ISeq rest(){

-		return create(seq.rest());

+	public ISeq next(){

+		return create(seq.next());

 	}

 

 	public KeySeq withMeta(IPersistentMap meta){

@@ -161,8 +161,8 @@ static public class ValSeq extends ASeq{
 		return ((Map.Entry) seq.first()).getValue();

 	}

 

-	public ISeq rest(){

-		return create(seq.rest());

+	public ISeq next(){

+		return create(seq.next());

 	}

 

 	public ValSeq withMeta(IPersistentMap meta){

diff --git a/src/jvm/clojure/lang/APersistentSet.java b/src/jvm/clojure/lang/APersistentSet.java
index 36063276..d6e815e9 100644
--- a/src/jvm/clojure/lang/APersistentSet.java
+++ b/src/jvm/clojure/lang/APersistentSet.java
@@ -80,7 +80,7 @@ public int hashCode(){
 		{
 		//int hash = count();
 		int hash = 0;
-		for(ISeq s = seq(); s != null; s = s.rest())
+		for(ISeq s = seq(); s != null; s = s.next())
 			{
 			Object e = s.first();
 //			hash = Util.hashCombine(hash, Util.hash(e));
@@ -132,7 +132,7 @@ public Object[] toArray(Object[] a){
 	if(a.length >= count())
 		{
 		ISeq s = seq();
-		for(int i = 0; s != null; ++i, s = s.rest())
+		for(int i = 0; s != null; ++i, s = s.next())
 			{
 			a[i] = s.first();
 			}
diff --git a/src/jvm/clojure/lang/APersistentVector.java b/src/jvm/clojure/lang/APersistentVector.java
index dbdbacd1..70192d3b 100644
--- a/src/jvm/clojure/lang/APersistentVector.java
+++ b/src/jvm/clojure/lang/APersistentVector.java
@@ -72,8 +72,8 @@ static boolean doEquals(IPersistentVector v, Object obj){
 		{
 		if(!(obj instanceof Sequential))
 			return false;
-		ISeq ms = ((IPersistentCollection) obj).seq();
-		for(int i = 0; i < v.count(); i++, ms = ms.rest())
+		ISeq ms = RT.seq(obj);
+		for(int i = 0; i < v.count(); i++, ms = ms.next())
 			{
 			if(ms == null || !Util.equals(v.nth(i), ms.first()))
 				return false;
@@ -115,8 +115,8 @@ static boolean doEquiv(IPersistentVector v, Object obj){
 		{
 		if(!(obj instanceof Sequential))
 			return false;
-		ISeq ms = ((IPersistentCollection) obj).seq();
-		for(int i = 0; i < v.count(); i++, ms = ms.rest())
+		ISeq ms = RT.seq(obj);
+		for(int i = 0; i < v.count(); i++, ms = ms.next())
 			{
 			if(ms == null || !Util.equiv(v.nth(i), ms.first()))
 				return false;
@@ -357,7 +357,7 @@ public Object[] toArray(Object[] a){
 	if(a.length >= count())
 		{
 		ISeq s = seq();
-		for(int i = 0; s != null; ++i, s = s.rest())
+		for(int i = 0; s != null; ++i, s = s.next())
 			{
 			a[i] = s.first();
 			}
@@ -378,7 +378,7 @@ public boolean isEmpty(){
 }
 
 public boolean contains(Object o){
-	for(ISeq s = seq(); s != null; s = s.rest())
+	for(ISeq s = seq(); s != null; s = s.next())
 		{
 		if(Util.equiv(s.first(), o))
 			return true;
@@ -438,7 +438,7 @@ public IStream stream() throws Exception {
 		return v.nth(i);
 	}
 
-	public ISeq rest(){
+	public ISeq next(){
 		if(i + 1 < v.count())
 			return new APersistentVector.Seq(v, i + 1);
 		return null;
@@ -469,7 +469,7 @@ public IStream stream() throws Exception {
 			ret = f.invoke(ret, v.nth(x));
 		return ret;
 	}
-}
+    }
 
 static class RSeq extends ASeq implements IndexedSeq, Counted{
 	final IPersistentVector v;
@@ -490,7 +490,7 @@ static class RSeq extends ASeq implements IndexedSeq, Counted{
 		return v.nth(i);
 	}
 
-	public ISeq rest(){
+	public ISeq next(){
 		if(i > 0)
 			return new APersistentVector.RSeq(v, i - 1);
 		return null;
diff --git a/src/jvm/clojure/lang/ARef.java b/src/jvm/clojure/lang/ARef.java
index 8b88de76..33e88d8c 100644
--- a/src/jvm/clojure/lang/ARef.java
+++ b/src/jvm/clojure/lang/ARef.java
@@ -88,7 +88,7 @@ public abstract class ARef extends AReference implements IRef {
         if (ws.count() > 0)
             {
             ISeq args = new Cons(this, null);
-            for (ISeq s = RT.seq(ws); s != null; s = s.rest())
+            for (ISeq s = RT.seq(ws); s != null; s = s.next())
                 {
                 Map.Entry e = (Map.Entry) s.first();
                 Object[] a = (Object[]) e.getValue();
diff --git a/src/jvm/clojure/lang/ASeq.java b/src/jvm/clojure/lang/ASeq.java
index 068f9060..a9c13f06 100644
--- a/src/jvm/clojure/lang/ASeq.java
+++ b/src/jvm/clojure/lang/ASeq.java
@@ -36,7 +36,7 @@ public boolean equiv(Object obj){
 	if(!(obj instanceof Sequential || obj instanceof List))

 		return false;

 	ISeq ms = RT.seq(obj);

-	for(ISeq s = seq(); s != null; s = s.rest(), ms = ms.rest())

+	for(ISeq s = seq(); s != null; s = s.next(), ms = ms.next())

 		{

 		if(ms == null || !Util.equiv(s.first(), ms.first()))

 			return false;

@@ -50,7 +50,7 @@ public boolean equals(Object obj){
 	if(!(obj instanceof Sequential || obj instanceof List))

 		return false;

 	ISeq ms = RT.seq(obj);

-	for(ISeq s = seq(); s != null; s = s.rest(), ms = ms.rest())

+	for(ISeq s = seq(); s != null; s = s.next(), ms = ms.next())

 		{

 		if(ms == null || !Util.equals(s.first(), ms.first()))

 			return false;

@@ -63,7 +63,7 @@ public int hashCode(){
 	if(_hash == -1)

 		{

 		int hash = 1;

-		for(ISeq s = seq(); s != null; s = s.rest())

+		for(ISeq s = seq(); s != null; s = s.next())

 			{

 			hash = 31 * hash + (s.first() == null ? 0 : s.first().hashCode());

 			}