Refactor range class hierarchy.

aardvark179 · aardvark179 · commit bc8f1ed03dbc · 2022-06-29T13:39:17.000+01:00
diff --git a/src/main/java/org/truffleruby/RubyLanguage.java b/src/main/java/org/truffleruby/RubyLanguage.java
@@ -66,8 +66,6 @@
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.queue.RubyQueue;
 import org.truffleruby.core.queue.RubySizedQueue;
-import org.truffleruby.core.range.RubyIntRange;
-import org.truffleruby.core.range.RubyLongRange;
 import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.regexp.RegexpCacheKey;
 import org.truffleruby.core.regexp.RegexpTable;
diff --git a/src/main/java/org/truffleruby/core/array/ArrayNodes.java b/src/main/java/org/truffleruby/core/array/ArrayNodes.java
@@ -61,7 +61,7 @@
 import org.truffleruby.core.range.RangeNodes.NormalizedStartLengthNode;
 import org.truffleruby.core.range.RubyIntRange;
 import org.truffleruby.core.range.RubyLongRange;
-import org.truffleruby.core.range.RubyRange;
+import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.rope.Rope;
 import org.truffleruby.core.rope.RopeNodes;
 import org.truffleruby.core.rope.RopeOperations;
@@ -279,7 +279,7 @@ protected Object index(RubyArray array, int index, NotProvided length,
         }
 
         @Specialization
-        protected Object indexRange(RubyArray array, RubyRange range, NotProvided length,
+        protected Object indexRange(RubyArray array, RubyObjectRange range, NotProvided length,
                 @Cached NormalizedStartLengthNode startLengthNode,
                 @Cached ReadSliceNormalizedNode readSlice) {
             final int[] startLength = startLengthNode.execute(range, array.size);
@@ -381,7 +381,7 @@ protected Object set(RubyArray array, int index, Object value, NotProvided unuse
         }
 
         @Specialization
-        protected Object setRange(RubyArray array, RubyRange range, Object value, NotProvided unused,
+        protected Object setRange(RubyArray array, RubyObjectRange range, Object value, NotProvided unused,
                 @Cached NormalizedStartLengthNode normalizedStartLength,
                 @Cached BranchProfile negativeStart) {
             final int[] startLength = normalizedStartLength.execute(range, array.size);
diff --git a/src/main/java/org/truffleruby/core/range/RangeNodes.java b/src/main/java/org/truffleruby/core/range/RangeNodes.java
@@ -85,7 +85,7 @@ protected RubyArray map(RubyIntRange range, RubyProc block,
         }
 
         @Specialization(guards = "!isIntRange(range)")
-        protected Object mapFallback(RubyRange range, Object block) {
+        protected Object mapFallback(RubyObjectRange range, Object block) {
             return FAILURE;
         }
     }
@@ -156,7 +156,7 @@ protected Object eachObject(RubyObjectRange range, RubyProc block) {
     public abstract static class ExcludeEndNode extends CoreMethodArrayArgumentsNode {
 
         @Specialization
-        protected boolean excludeEnd(RubyRange range) {
+        protected boolean excludeEnd(RubyObjectRange range) {
             return range.excludedEnd;
         }
 
diff --git a/src/main/java/org/truffleruby/core/range/RubyIntRange.java b/src/main/java/org/truffleruby/core/range/RubyIntRange.java
@@ -9,8 +9,18 @@
  */
 package org.truffleruby.core.range;
 
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+
+import org.truffleruby.RubyContext;
 import org.truffleruby.language.ImmutableRubyObject;
+import org.truffleruby.language.dispatch.DispatchNode;
 
+@ExportLibrary(InteropLibrary.class)
 public final class RubyIntRange extends ImmutableRubyObject {
 
     public final int begin;
@@ -24,4 +34,17 @@ public RubyIntRange(boolean excludedEnd, int begin, int end) {
 
     }
 
+    @ExportMessage
+    public boolean hasIterator() {
+        return true;
+    }
+
+    @ExportMessage
+    public Object getIterator(
+            @CachedLibrary("this") InteropLibrary node,
+            @Exclusive @Cached DispatchNode dispatchNode) {
+        final RubyContext context = RubyContext.get(node);
+        return dispatchNode.call(context.getCoreLibrary().truffleInteropOperationsModule, "get_iterator", this);
+    }
+
 }
diff --git a/src/main/java/org/truffleruby/core/range/RubyLongRange.java b/src/main/java/org/truffleruby/core/range/RubyLongRange.java
@@ -9,8 +9,18 @@
  */
 package org.truffleruby.core.range;
 
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.Cached.Exclusive;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
+
+import org.truffleruby.RubyContext;
 import org.truffleruby.language.ImmutableRubyObject;
+import org.truffleruby.language.dispatch.DispatchNode;
 
+@ExportLibrary(InteropLibrary.class)
 public final class RubyLongRange extends ImmutableRubyObject {
 
     public final long begin;
@@ -23,4 +33,17 @@ public RubyLongRange(boolean excludedEnd, long begin, long end) {
         this.end = end;
     }
 
+    @ExportMessage
+    public boolean hasIterator() {
+        return true;
+    }
+
+    @ExportMessage
+    public Object getIterator(
+            @CachedLibrary("this") InteropLibrary node,
+            @Exclusive @Cached DispatchNode dispatchNode) {
+        final RubyContext context = RubyContext.get(node);
+        return dispatchNode.call(context.getCoreLibrary().truffleInteropOperationsModule, "get_iterator", this);
+    }
+
 }
diff --git a/src/main/java/org/truffleruby/core/range/RubyObjectRange.java b/src/main/java/org/truffleruby/core/range/RubyObjectRange.java
@@ -9,17 +9,23 @@
  */
 package org.truffleruby.core.range;
 
-import org.truffleruby.core.klass.RubyClass;
-import org.truffleruby.language.Nil;
+import java.util.Set;
 
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.api.object.Shape;
+import org.truffleruby.core.klass.RubyClass;
+import org.truffleruby.language.Nil;
+import org.truffleruby.language.RubyDynamicObject;
+import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectGraphNode;
 
-import java.util.Set;
-
-public final class RubyObjectRange extends RubyRange implements ObjectGraphNode {
+@ExportLibrary(RubyLibrary.class)
+public final class RubyObjectRange extends RubyDynamicObject implements ObjectGraphNode {
 
+    public boolean excludedEnd;
+    public boolean frozen;
     public Object begin;
     public Object end;
 
@@ -30,9 +36,21 @@ public RubyObjectRange(
             Object begin,
             Object end,
             boolean frozen) {
-        super(rubyClass, shape, excludedEnd, frozen);
+        super(rubyClass, shape);
+        this.excludedEnd = excludedEnd;
         this.begin = begin;
         this.end = end;
+        this.frozen = frozen;
+    }
+
+    @ExportMessage
+    protected void freeze() {
+        frozen = true;
+    }
+
+    @ExportMessage
+    protected boolean isFrozen() {
+        return frozen;
     }
 
     public boolean isBoundless() {
diff --git a/src/main/java/org/truffleruby/core/range/RubyRange.java b/src/main/java/org/truffleruby/core/range/RubyRange.java
diff --git a/src/main/java/org/truffleruby/language/RubyDynamicObject.java b/src/main/java/org/truffleruby/language/RubyDynamicObject.java
@@ -21,7 +21,7 @@
 import org.truffleruby.core.cast.ToLongNode;
 import org.truffleruby.core.kernel.KernelNodes;
 import org.truffleruby.core.klass.RubyClass;
-import org.truffleruby.core.range.RubyRange;
+import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.string.RubyString;
 import org.truffleruby.core.string.StringUtils;
 import org.truffleruby.interop.ForeignToRubyArgumentsNode;
@@ -119,7 +119,7 @@ public boolean isFrozen(
 
     public boolean isFrozenUncached() {
         CompilerAsserts.neverPartOfCompilation("Use RubyLibrary instead in PE code");
-        assert !(this instanceof RubyString) && !(this instanceof RubyRange);
+        assert !(this instanceof RubyString) && !(this instanceof RubyObjectRange);
         return (getShape().getFlags() & FROZEN) != 0;
     }
     // endregion
diff --git a/src/main/java/org/truffleruby/language/RubyGuards.java b/src/main/java/org/truffleruby/language/RubyGuards.java
@@ -22,7 +22,7 @@
 import org.truffleruby.core.proc.RubyProc;
 import org.truffleruby.core.range.RubyIntRange;
 import org.truffleruby.core.range.RubyLongRange;
-import org.truffleruby.core.range.RubyRange;
+import org.truffleruby.core.range.RubyObjectRange;
 import org.truffleruby.core.regexp.RubyMatchData;
 import org.truffleruby.core.regexp.RubyRegexp;
 import org.truffleruby.core.string.ImmutableRubyString;
@@ -104,7 +104,8 @@ public static boolean isIntRange(Object value) {
     }
 
     public static boolean isRubyRange(Object value) {
-        return value instanceof RubyRange || value instanceof RubyIntRange || value instanceof RubyLongRange;
+        return value instanceof RubyObjectRange || value instanceof RubyIntRange ||
+                value instanceof RubyLongRange;
     }
 
     public static boolean isRubyArray(Object value) {

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ protected RubyArray map(RubyIntRange range, RubyProc block,`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`@Specialization(guards = "!isIntRange(range)")`
`88`		`- protected Object mapFallback(RubyRange range, Object block) {`
	`88`	`+ protected Object mapFallback(RubyObjectRange range, Object block) {`
`89`	`89`	`return FAILURE;`
`90`	`90`	`}`
`91`	`91`	`}`
`@@ -156,7 +156,7 @@ protected Object eachObject(RubyObjectRange range, RubyProc block) {`
`156`	`156`	`public abstract static class ExcludeEndNode extends CoreMethodArrayArgumentsNode {`
`157`	`157`
`158`	`158`	`@Specialization`
`159`		`- protected boolean excludeEnd(RubyRange range) {`
	`159`	`+ protected boolean excludeEnd(RubyObjectRange range) {`
`160`	`160`	`return range.excludedEnd;`
`161`	`161`	`}`
`162`	`162`