[GR-29405] Implement interop iterable messages for ruby enumerables

eregon · eregon · commit 14fe7531d4d1 · 2021-03-05T19:31:44.000Z
PullRequest: truffleruby/2426
diff --git a/mx.truffleruby/suite.py b/mx.truffleruby/suite.py
@@ -7,7 +7,7 @@
             {
                 "name": "regex",
                 "subdir": True,
-                "version": "bf2c742da013f65f715dad08f58cb6a8eec1eee4",
+                "version": "eb1d9e5a58e016d3284e2df06ca65446b37b61c0",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -16,7 +16,7 @@
             {
                 "name": "sulong",
                 "subdir": True,
-                "version": "bf2c742da013f65f715dad08f58cb6a8eec1eee4",
+                "version": "eb1d9e5a58e016d3284e2df06ca65446b37b61c0",
                 "urls": [
                     {"url": "https://github.com/oracle/graal.git", "kind": "git"},
                     {"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
diff --git a/spec/truffle/interop/iterator_spec.rb b/spec/truffle/interop/iterator_spec.rb
@@ -10,17 +10,48 @@
 require_relative 'fixtures/classes'
 
 describe "Truffle::Interop iterator messages" do
-  it "allow to iterate an array" do
-    obj = [1, 2]
+  def should_have_iterator(obj, expected_values)
     Truffle::Interop.should.has_iterator?(obj)
+
     iterator = Truffle::Interop.iterator(obj)
     Truffle::Interop.should.iterator?(iterator)
-
-    Truffle::Interop.has_iterator_next_element?(iterator).should == true
-    Truffle::Interop.iterator_next_element(iterator).should == 1
-    Truffle::Interop.has_iterator_next_element?(iterator).should == true
-    Truffle::Interop.iterator_next_element(iterator).should == 2
+    expected_values.each do |value|
+      Truffle::Interop.has_iterator_next_element?(iterator).should == true
+      Truffle::Interop.iterator_next_element(iterator).should == value
+    end
     Truffle::Interop.has_iterator_next_element?(iterator).should == false
     -> { Truffle::Interop.iterator_next_element(iterator) }.should raise_error(StopIteration)
+
+    iterator = Truffle::Interop.iterator(obj)
+    Truffle::Interop.should.iterator?(iterator)
+    expected_values.each do |value|
+      Truffle::Interop.iterator_next_element(iterator).should == value
+    end
+    -> { Truffle::Interop.iterator_next_element(iterator) }.should raise_error(StopIteration)
+  end
+
+  it "allow to iterate an array" do
+    should_have_iterator([1, 2], [1, 2])
+  end
+
+  it "allows iterating a range" do
+    should_have_iterator(1..3, [1, 2, 3])
+  end
+
+  it "allows iterating a hash" do
+    should_have_iterator({ 1 => "one", 2 => "two"}, [[1, "one"], [2, "two"]])
+  end
+
+  it "allows iterating user defined classes" do
+    cls = Class.new do
+      include Enumerable
+      def each
+        yield 1
+        yield 2
+      end
+    end
+
+    obj = cls.new
+    should_have_iterator(obj, [1, 2])
   end
 end
diff --git a/src/main/java/org/truffleruby/core/CoreLibrary.java b/src/main/java/org/truffleruby/core/CoreLibrary.java
@@ -175,6 +175,7 @@ public class CoreLibrary {
     public final RubyClass typeErrorClass;
     public final RubyClass zeroDivisionErrorClass;
     public final RubyModule enumerableModule;
+    public final RubyClass enumeratorClass;
     public final RubyModule errnoModule;
     public final RubyModule kernelModule;
     public final RubyModule truffleFFIModule;
@@ -194,6 +195,7 @@ public class CoreLibrary {
     public final RubyClass arityExceptionClass;
     public final RubyModule truffleFeatureLoaderModule;
     public final RubyModule truffleKernelOperationsModule;
+    public final RubyModule truffleInteropOperationsModule;
     public final RubyModule truffleStringOperationsModule;
     public final RubyModule truffleRegexpOperationsModule;
     public final RubyModule truffleRandomOperationsModule;
@@ -411,6 +413,7 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         defineClass("Data"); // Needed by Socket::Ifaddr and defined in core MRI
         dirClass = defineClass("Dir");
         encodingClass = defineClass("Encoding");
+        enumeratorClass = defineClass("Enumerator");
         falseClass = defineClass("FalseClass");
         fiberClass = defineClass("Fiber");
         defineModule("FileTest");
@@ -516,6 +519,7 @@ public CoreLibrary(RubyContext context, RubyLanguage language) {
         defineModule(truffleModule, "System");
         truffleFeatureLoaderModule = defineModule(truffleModule, "FeatureLoader");
         truffleKernelOperationsModule = defineModule(truffleModule, "KernelOperations");
+        truffleInteropOperationsModule = defineModule(truffleModule, "InteropOperations");
         defineModule(truffleModule, "Binding");
         defineModule(truffleModule, "POSIX");
         defineModule(truffleModule, "Readline");
@@ -997,6 +1001,7 @@ public boolean isTruffleBootMainMethod(SharedMethodInfo info) {
             "/core/truffle/debug.rb",
             "/core/truffle/encoding_operations.rb",
             "/core/truffle/hash_operations.rb",
+            "/core/truffle/interop_operations.rb",
             "/core/truffle/numeric_operations.rb",
             "/core/truffle/proc_operations.rb",
             "/core/truffle/range_operations.rb",
diff --git a/src/main/java/org/truffleruby/core/array/RubyArray.java b/src/main/java/org/truffleruby/core/array/RubyArray.java
@@ -11,6 +11,10 @@
 
 import java.util.Set;
 
+import com.oracle.truffle.api.CompilerDirectives;
+import com.oracle.truffle.api.interop.StopIterationException;
+import com.oracle.truffle.api.interop.TruffleObject;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
 import org.truffleruby.core.klass.RubyClass;
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyGuards;
@@ -128,6 +132,66 @@ public boolean isArrayElementInsertable(long index,
     }
     // endregion
 
+    // region Iterable Messages
+    @ExportMessage
+    public boolean hasIterator() {
+        return true;
+    }
+
+    /** Override {@link RubyDynamicObject#getIterator} to avoid the extra Fiber for RubyArray */
+    @ExportMessage
+    public ArrayIterator getIterator() {
+        return new ArrayIterator(this);
+    }
+
+    @ExportLibrary(InteropLibrary.class)
+    static final class ArrayIterator implements TruffleObject {
+
+        final RubyArray array;
+        private long currentItemIndex;
+
+        ArrayIterator(RubyArray array) {
+            this.array = array;
+        }
+
+        @ExportMessage
+        boolean isIterator() {
+            return true;
+        }
+
+        @ExportMessage
+        boolean hasIteratorNextElement(
+                @CachedLibrary("this.array") InteropLibrary arrays) {
+            try {
+                return currentItemIndex < arrays.getArraySize(array);
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
+        }
+
+        @ExportMessage
+        Object getIteratorNextElement(
+                @CachedLibrary("this.array") InteropLibrary arrays,
+                @Cached BranchProfile concurrentModification) throws StopIterationException {
+            try {
+                final long size = arrays.getArraySize(array);
+                if (currentItemIndex >= size) {
+                    throw StopIterationException.create();
+                }
+
+                final Object element = arrays.readArrayElement(array, currentItemIndex);
+                currentItemIndex++;
+                return element;
+            } catch (InvalidArrayIndexException e) {
+                concurrentModification.enter();
+                throw StopIterationException.create();
+            } catch (UnsupportedMessageException e) {
+                throw CompilerDirectives.shouldNotReachHere(e);
+            }
+        }
+    }
+    // endregion
+
     private boolean inBounds(long index) {
         return index >= 0 && index < size;
     }
diff --git a/src/main/java/org/truffleruby/language/RubyDynamicObject.java b/src/main/java/org/truffleruby/language/RubyDynamicObject.java
@@ -9,6 +9,7 @@
  */
 package org.truffleruby.language;
 
+import com.oracle.truffle.api.interop.StopIterationException;
 import org.truffleruby.Layouts;
 import org.truffleruby.RubyContext;
 import org.truffleruby.RubyLanguage;
@@ -30,6 +31,7 @@
 import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.library.RubyStringLibrary;
 import org.truffleruby.language.methods.GetMethodObjectNode;
+import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.LogicalClassNode;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
 
@@ -285,6 +287,71 @@ public boolean isArrayElementRemovable(long index,
     }
     // endregion
 
+    // region Iterable Messages
+    @ExportMessage
+    public boolean hasIterator(
+            @CachedContext(RubyLanguage.class) RubyContext context,
+            @Exclusive @Cached IsANode isANode) {
+        return isANode.executeIsA(this, context.getCoreLibrary().enumerableModule);
+    }
+
+    @ExportMessage
+    public Object getIterator(
+            @CachedLibrary("this") InteropLibrary interopLibrary,
+            @CachedContext(RubyLanguage.class) RubyContext context,
+            @Exclusive @Cached DispatchNode dispatchNode) throws UnsupportedMessageException {
+        if (!interopLibrary.hasIterator(this)) {
+            throw UnsupportedMessageException.create();
+        }
+        return dispatchNode.call(context.getCoreLibrary().truffleInteropOperationsModule, "get_iterator", this);
+    }
+
+    @ExportMessage
+    public boolean isIterator(
+            @CachedContext(RubyLanguage.class) RubyContext context,
+            @Exclusive @Cached IsANode isANode) {
+        return isANode.executeIsA(this, context.getCoreLibrary().enumeratorClass);
+    }
+
+    @ExportMessage
+    public boolean hasIteratorNextElement(
+            @CachedLibrary("this") InteropLibrary interopLibrary,
+            @CachedContext(RubyLanguage.class) RubyContext context,
+            @Exclusive @Cached DispatchNode dispatchNode,
+            @Exclusive @Cached BooleanCastNode booleanCastNode) throws UnsupportedMessageException {
+        if (!interopLibrary.isIterator(this)) {
+            throw UnsupportedMessageException.create();
+        }
+        return booleanCastNode.executeToBoolean(
+                dispatchNode.call(
+                        context.getCoreLibrary().truffleInteropOperationsModule,
+                        "enumerator_has_next?",
+                        this));
+    }
+
+    @ExportMessage
+    public Object getIteratorNextElement(
+            @CachedLibrary("this") InteropLibrary interopLibrary,
+            @CachedContext(RubyLanguage.class) RubyContext context,
+            @Exclusive @Cached DispatchNode dispatchNode,
+            @Exclusive @Cached IsANode isANode,
+            @Exclusive @Cached ConditionProfile stopIterationProfile)
+            throws UnsupportedMessageException, StopIterationException {
+        if (!interopLibrary.isIterator(this)) {
+            throw UnsupportedMessageException.create();
+        }
+        try {
+            return dispatchNode.call(this, "next");
+        } catch (RaiseException e) {
+            if (stopIterationProfile
+                    .profile(isANode.executeIsA(e.getException(), context.getCoreLibrary().stopIterationClass))) {
+                throw StopIterationException.create(e);
+            }
+            throw e;
+        }
+    }
+    // endregion
+
     // region Pointer
     @ExportMessage
     public boolean isPointer(
diff --git a/src/main/ruby/truffleruby/core/truffle/interop_operations.rb b/src/main/ruby/truffleruby/core/truffle/interop_operations.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2021, 2021 Oracle and/or its affiliates. All rights reserved. This
+# code is released under a tri EPL/GPL/LGPL license. You can use it,
+# redistribute it and/or modify it under the terms of the:
+#
+# Eclipse Public License version 2.0, or
+# GNU General Public License version 2, or
+# GNU Lesser General Public License version 2.1.
+
+module Truffle
+  module InteropOperations
+    TO_ENUM = Kernel.instance_method(:to_enum)
+
+    def self.get_iterator(obj)
+      TO_ENUM.bind_call(obj, :each)
+    end
+
+    def self.enumerator_has_next?(enum)
+      begin
+        enum.peek
+        true
+      rescue StopIteration
+        false
+      end
+    end
+
+  end
+end
