[Jython-checkins] SF.net SVN: jython:[4980] branches/asm/src/org/python/core/ PyFastSequenceIter.java

[<pj...@us...>]

Revision: 4980
          http://jython.svn.sourceforge.net/jython/?rev=4980&view=rev
Author:   pjenvey
Date:     2008-07-21 05:00:49 +0000 (Mon, 21 Jul 2008)

Log Message:
-----------
integrate the sink state conditions

Modified Paths:
--------------
    branches/asm/src/org/python/core/PyFastSequenceIter.java

Modified: branches/asm/src/org/python/core/PyFastSequenceIter.java
===================================================================
--- branches/asm/src/org/python/core/PyFastSequenceIter.java	2008-07-21 04:59:03 UTC (rev 4979)
+++ branches/asm/src/org/python/core/PyFastSequenceIter.java	2008-07-21 05:00:49 UTC (rev 4980)
@@ -15,13 +15,23 @@
     }
 
     public PyObject __iternext__() {
+        if (seq == null) {
+            return null;
+        }
+
+        PyObject result;
         try {
-            return seq.seq___finditem__(index++);
+            result = seq.seq___finditem__(index++);
         } catch (PyException exc) {
             if (Py.matchException(exc, Py.StopIteration)) {
+                seq = null;
                 return null;
             }
             throw exc;
         }
+        if (result == null) {
+            seq = null;
+        }
+        return result;
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.