implement iterator/iterable messages

Author: timfel

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -92,6 +92,7 @@ public class PythonProvider implements LanguageProvider {
     private static final TypeDescriptor BYTES = intersection(OBJECT, ITERABLE, array(INT));
     private static final TypeDescriptor BYTEARRAY = intersection(OBJECT, ITERABLE, array(INT));
     private static final TypeDescriptor DICT = dict(ANY, ANY);
+    private static final TypeDescriptor SET = set(ANY);
     private static final TypeDescriptor LIST = list(ANY);
     private static final TypeDescriptor TUPLE = tuple(ANY);
     private static final TypeDescriptor DATETIME_DATE = intersection(OBJECT, DATE);
@@ -117,6 +118,10 @@ private static final TypeDescriptor dict(TypeDescriptor keyType, @SuppressWarnin
         return intersection(OBJECT, iterable(keyType));
     }
 
+    private static final TypeDescriptor set(TypeDescriptor componentType) {
+        return intersection(OBJECT, iterable(componentType));
+    }
+
     private static final TypeDescriptor iter(TypeDescriptor componentType) {
         return intersection(OBJECT, iterable(componentType), iterator(componentType));
     }
@@ -179,6 +184,7 @@ public Collection<? extends Snippet> createValueConstructors(Context context) {
             "dict", DICT, "{object(): 'q'}",
             "dict:int-str", dict(INT, STR), "{1: 'q'}",
             "dict:str-int", dict(STR, INT), "{'q': 1}",
+            "set", SET, "{object(), 'q', 12}",
             "datetime", DATETIME_DATETIME, "import datetime; datetime.datetime.now()",
             "date", DATETIME_DATE, "import datetime; datetime.date.today()",
             "time", DATETIME_TIME, "import datetime; datetime.datetime.now().time()",

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/PythonAbstractObject.java

@@ -62,6 +62,7 @@
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__INT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__ITER__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__LEN__;
+import static com.oracle.graal.python.nodes.SpecialMethodNames.__NEXT__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SETITEM__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__SET__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.__STR__;
@@ -159,6 +160,7 @@
 import com.oracle.truffle.api.interop.ArityException;
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.interop.InvalidArrayIndexException;
+import com.oracle.truffle.api.interop.StopIterationException;
 import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.api.interop.UnknownIdentifierException;
 import com.oracle.truffle.api.interop.UnsupportedMessageException;
@@ -170,6 +172,8 @@
 import com.oracle.truffle.api.nodes.ExplodeLoop;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
+import com.oracle.truffle.api.object.HiddenKey;
 import com.oracle.truffle.api.object.Shape;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.ConditionProfile;
@@ -2092,4 +2096,64 @@ public static Object getIteratorWithState(PythonAbstractObject self, ThreadState
             throw raise.raise(PythonErrorType.TypeError, ErrorMessages.OBJ_NOT_ITERABLE, self);
         }
     }
+
+    @ExportMessage
+    public boolean hasIterator(
+                    @CachedLibrary("this") PythonObjectLibrary lib) {
+        return lib.isIterable(this);
+    }
+
+    @ExportMessage
+    public Object getIterator(
+                    @CachedLibrary("this") PythonObjectLibrary lib) throws UnsupportedMessageException {
+        if (lib.isIterable(this)) {
+            return lib.getIterator(this);
+        } else {
+            throw UnsupportedMessageException.create();
+        }
+    }
+
+    @ExportMessage
+    public boolean isIterator(
+                    @CachedLibrary("this") PythonObjectLibrary lib) {
+        return lib.lookupAttributeOnType(this, __NEXT__) != PNone.NO_VALUE;
+    }
+
+    private static final HiddenKey NEXT_ELEMENT = new HiddenKey("next_element");
+
+    @ExportMessage
+    public boolean hasIteratorNextElement(
+                    @CachedLibrary("this") InteropLibrary ilib,
+                    @CachedLibrary("this") PythonObjectLibrary plib,
+                    @CachedLibrary("this") DynamicObjectLibrary dylib,
+                    @Exclusive @Cached IsBuiltinClassProfile exceptionProfile) throws UnsupportedMessageException {
+        if (ilib.isIterator(this)) {
+            Object nextElement = dylib.getOrDefault(this, NEXT_ELEMENT, null);
+            if (nextElement != null) {
+                return true;
+            }
+            try {
+                nextElement = plib.lookupAndCallSpecialMethod(this, null, __NEXT__);
+                dylib.put(this, NEXT_ELEMENT, nextElement);
+                return true;
+            } catch (PException e) {
+                e.expect(PythonBuiltinClassType.StopIteration, exceptionProfile);
+                return false;
+            }
+        }
+        throw UnsupportedMessageException.create();
+    }
+
+    @ExportMessage
+    public Object getIteratorNextElement(
+                    @CachedLibrary("this") InteropLibrary ilib,
+                    @CachedLibrary("this") DynamicObjectLibrary dylib) throws StopIterationException, UnsupportedMessageException {
+        if (ilib.hasIteratorNextElement(this)) {
+            Object nextElement = dylib.getOrDefault(this, NEXT_ELEMENT, null);
+            dylib.put(this, NEXT_ELEMENT, null);
+            return nextElement;
+        } else {
+            throw StopIterationException.create();
+        }
+    }
 }