CLJ-1453 Fix iterator implementations to throw NSEE when exhausted

Signed-off-by: Stuart Halloway <stu@cognitect.com>

Author: puredanger

src/clj/clojure/gvec.clj

@@ -385,7 +385,10 @@
     (let [i (java.util.concurrent.atomic.AtomicInteger. 0)]
       (reify java.util.Iterator
         (hasNext [_] (< (.get i) cnt))
-        (next [_] (.nth this (dec (.incrementAndGet i))))
+        (next [_] (try
+                    (.nth this (dec (.incrementAndGet i)))
+                    (catch IndexOutOfBoundsException _
+                      (throw (java.util.NoSuchElementException.)))))
         (remove [_] (throw (UnsupportedOperationException.))))))
 
   java.util.Collection
@@ -428,9 +431,15 @@
       (reify java.util.ListIterator
         (hasNext [_] (< (.get i) cnt))
         (hasPrevious [_] (pos? i))
-        (next [_] (.nth this (dec (.incrementAndGet i))))
+        (next [_] (try
+                    (.nth this (dec (.incrementAndGet i)))
+                    (catch IndexOutOfBoundsException _
+                      (throw (java.util.NoSuchElementException.)))))
         (nextIndex [_] (.get i))
-        (previous [_] (.nth this (.decrementAndGet i)))
+        (previous [_] (try
+                        (.nth this (.decrementAndGet i))
+                        (catch IndexOutOfBoundsException _
+                          (throw (java.util.NoSuchElementException.)))))
         (previousIndex [_] (dec (.get i)))
         (add [_ e] (throw (UnsupportedOperationException.)))
         (remove [_] (throw (UnsupportedOperationException.)))

src/jvm/clojure/lang/APersistentVector.java

@@ -223,15 +223,21 @@ public boolean hasNext(){
 		}
 
 		public Object next(){
-			return nth(nexti++);
+			if(nexti < count())
+				return nth(nexti++);
+			else
+				throw new NoSuchElementException();
 		}
 
 		public boolean hasPrevious(){
 			return nexti > 0;
 		}
 
 		public Object previous(){
-			return nth(--nexti);
+			if(nexti > 0)
+				return nth(--nexti);
+			else
+				throw new NoSuchElementException();
 		}
 
 		public int nextIndex(){
@@ -265,7 +271,10 @@ public boolean hasNext(){
 		}
 
 		public Object next(){
-			return nth(i++);
+			if(i < end)
+				return nth(i++);
+			else
+				throw new NoSuchElementException();
 		}
 
 		public void remove(){
@@ -308,7 +317,9 @@ public boolean hasNext(){
 		}
 
 		public Object next(){
-			return nth(i++);
+			if(i < count())
+				return nth(i++);
+			else throw new NoSuchElementException();
 		}
 
 		public void remove(){

src/jvm/clojure/lang/ArrayIter.java

@@ -19,7 +19,7 @@ public class ArrayIter implements Iterator {
 
 static public Iterator EMPTY_ITERATOR = new Iterator() {
   public boolean hasNext() { return false; }
-  public Object next() { return null; }
+  public Object next() { throw new java.util.NoSuchElementException(); }
   public void remove() { throw new UnsupportedOperationException("remove() not supported"); }
 };
 
@@ -68,7 +68,7 @@ public boolean hasNext() {
 public Object next() {
   if(array != null && i < array.length)
     return array[i++];
-  return null;
+  throw new java.util.NoSuchElementException();
 }
 
 public void remove() {
@@ -93,7 +93,7 @@ public boolean hasNext() {
   public Long next() {
     if(array != null && i < array.length)
       return Long.valueOf(array[i++]);
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -117,7 +117,7 @@ public boolean hasNext() {
   public Double next() {
     if(array != null && i < array.length)
       return Double.valueOf(array[i++]);
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -141,7 +141,7 @@ public boolean hasNext() {
   public Double next() {
     if(array != null && i < array.length)
       return array[i++];
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -166,7 +166,7 @@ public boolean hasNext() {
   public Long next() {
     if(array != null && i < array.length)
       return Long.valueOf(array[i++]);
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -191,7 +191,7 @@ public boolean hasNext() {
   public Byte next() {
     if(array != null && i < array.length)
       return array[i++];
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -216,7 +216,7 @@ public boolean hasNext() {
   public Character next() {
     if(array != null && i < array.length)
       return array[i++];
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -241,7 +241,7 @@ public boolean hasNext() {
   public Long next() {
     if(array != null && i < array.length)
       return Long.valueOf(array[i++]);
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {
@@ -266,7 +266,7 @@ public boolean hasNext() {
   public Boolean next() {
     if(array != null && i < array.length)
       return Boolean.valueOf(array[i++]);
-    return null;
+    throw new java.util.NoSuchElementException();
   }
 
   public void remove() {

src/jvm/clojure/lang/PersistentArrayMap.java

@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.NoSuchElementException;
 
 /**
  * Simple implementation of persistent map on an array
@@ -353,8 +354,12 @@ public boolean hasNext(){
 	}
 
 	public Object next(){
-		i += 2;
-		return f.invoke(array[i],array[i+1]);
+		try {
+			i += 2;
+			return f.invoke(array[i], array[i+1]);
+		} catch(IndexOutOfBoundsException e) {
+			throw new NoSuchElementException();
+		}
 	}
 
 	public void remove(){

src/jvm/clojure/lang/PersistentTreeMap.java

@@ -855,9 +855,13 @@ public boolean hasNext(){
 	}
 
 	public Object next(){
-		Node t = (Node) stack.pop();
-		push(asc ? t.right() : t.left());
-		return t;
+		try {
+			Node t = (Node) stack.pop();
+			push(asc ? t.right() : t.left());
+			return t;
+		} catch(EmptyStackException e) {
+			throw new NoSuchElementException();
+		}
 	}
 
 	public void remove(){

src/jvm/clojure/lang/PersistentVector.java

@@ -16,6 +16,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.concurrent.atomic.AtomicReference;
 
 public class PersistentVector extends APersistentVector implements IObj, IEditableCollection, IReduce, IKVReduce{
@@ -294,12 +295,16 @@ public boolean hasNext(){
 			}
 
 		public Object next(){
-			if(i-base == 32){
-				array = arrayFor(i);
-				base += 32;
+			if(i < end) {
+				if(i-base == 32){
+					array = arrayFor(i);
+					base += 32;
 				}
-			return array[i++ & 0x01f];
+				return array[i++ & 0x01f];
+			} else {
+				throw new NoSuchElementException();
 			}
+		}
 
 		public void remove(){
 			throw new UnsupportedOperationException();