[GR-9860] List Iterator provides values even after StopIteration exception.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/list_tests.py

@@ -613,7 +613,7 @@ class F(object):
             def __iter__(self):
                 raise KeyboardInterrupt
         self.assertRaises(KeyboardInterrupt, list, F())
-
+    '''
     def test_exhausted_iterator(self):
         a = self.type2test([1, 2, 3])
         exhit = iter(a)
@@ -624,5 +624,4 @@ def test_exhausted_iterator(self):
         self.assertEqual(list(exhit), [])
         self.assertEqual(list(empit), [9])
         self.assertEqual(a, self.type2test([1, 2, 3, 9]))
-    '''
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/IteratorBuiltins.java

@@ -75,9 +75,10 @@ public int next(PIntArrayIterator self) {
 
         @Specialization
         public int next(PIntegerSequenceIterator self) {
-            if (self.index < self.sequence.length()) {
+            if (!self.stopIterationReached && self.index < self.sequence.length()) {
                 return self.sequence.getIntItemNormalized(self.index++);
             }
+            self.stopIterationReached = true;
             throw raise(StopIteration);
         }
 
@@ -111,9 +112,10 @@ public double next(PDoubleArrayIterator self) {
 
         @Specialization
         public double next(PDoubleSequenceIterator self) {
-            if (self.index < self.sequence.length()) {
+            if (!self.stopIterationReached && self.index < self.sequence.length()) {
                 return self.sequence.getDoubleItemNormalized(self.index++);
             }
+            self.stopIterationReached = true;
             throw raise(StopIteration);
         }
 
@@ -127,9 +129,10 @@ public long next(PLongArrayIterator self) {
 
         @Specialization
         public long next(PLongSequenceIterator self) {
-            if (self.index < self.sequence.length()) {
+            if (!self.stopIterationReached && self.index < self.sequence.length()) {
                 return self.sequence.getLongItemNormalized(self.index++);
             }
+            self.stopIterationReached = true;
             throw raise(StopIteration);
         }
 
@@ -143,9 +146,10 @@ public Object next(PBaseSetIterator self) {
 
         @Specialization(guards = "self.isPSequence()")
         public Object next(PSequenceIterator self) {
-            if (self.index < self.getPSequence().len()) {
+            if (!self.stopIterationReached && self.index < self.getPSequence().len()) {
                 return self.getPSequence().getItem(self.index++);
             }
+            self.stopIterationReached = true;
             throw raise(StopIteration);
         }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PDoubleSequenceIterator.java

@@ -32,6 +32,7 @@ public final class PDoubleSequenceIterator extends PDoubleIterator {
 
     final DoubleSequenceStorage sequence;
     int index;
+    protected boolean stopIterationReached = false;
 
     public PDoubleSequenceIterator(PythonClass clazz, DoubleSequenceStorage sequence) {
         super(clazz);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PIntegerSequenceIterator.java

@@ -32,6 +32,7 @@ public final class PIntegerSequenceIterator extends PIntegerIterator {
 
     final IntSequenceStorage sequence;
     int index;
+    protected boolean stopIterationReached = false; 
 
     public PIntegerSequenceIterator(PythonClass clazz, IntSequenceStorage sequence) {
         super(clazz);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PLongSequenceIterator.java

@@ -32,7 +32,8 @@ public final class PLongSequenceIterator extends PLongIterator {
 
     final LongSequenceStorage sequence;
     int index;
-
+    protected boolean stopIterationReached = false;
+    
     public PLongSequenceIterator(PythonClass clazz, LongSequenceStorage sequence) {
         super(clazz);
         this.sequence = sequence;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/iterator/PSequenceIterator.java

@@ -31,6 +31,7 @@
 public final class PSequenceIterator extends PBuiltinIterator {
     protected final Object sequence;
     protected int index = 0;
+    protected boolean stopIterationReached = false;
 
     public PSequenceIterator(PythonClass clazz, Object sequence) {
         super(clazz);