rename to InternalRespondToNode

Author: Nicolas Laurent

src/main/java/org/truffleruby/core/kernel/KernelNodes.java

@@ -100,7 +100,7 @@
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchConfiguration;
 import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 import org.truffleruby.language.dispatch.RubyCallNode;
 import org.truffleruby.language.eval.CreateEvalSourceNode;
 import org.truffleruby.language.globals.ReadGlobalVariableNodeGen;
@@ -1544,19 +1544,19 @@ protected Object send(VirtualFrame frame, Object self, Object name, Object[] arg
     @NodeChild(value = "includeProtectedAndPrivate", type = RubyNode.class)
     public abstract static class RespondToNode extends CoreMethodNode {
 
-        @Child private DispatchRespondToNode dispatch;
-        @Child private DispatchRespondToNode dispatchIgnoreVisibility;
-        @Child private DispatchRespondToNode dispatchRespondToMissing;
+        @Child private InternalRespondToNode dispatch;
+        @Child private InternalRespondToNode dispatchIgnoreVisibility;
+        @Child private InternalRespondToNode dispatchRespondToMissing;
         @Child private DispatchNode respondToMissingNode;
         @Child private BooleanCastNode booleanCastNode;
         private final ConditionProfile ignoreVisibilityProfile = ConditionProfile.create();
         private final ConditionProfile isTrueProfile = ConditionProfile.create();
         private final ConditionProfile respondToMissingProfile = ConditionProfile.create();
 
         public RespondToNode() {
-            dispatch = DispatchRespondToNode.create(PUBLIC);
-            dispatchIgnoreVisibility = DispatchRespondToNode.create();
-            dispatchRespondToMissing = DispatchRespondToNode.create();
+            dispatch = InternalRespondToNode.create(PUBLIC);
+            dispatchIgnoreVisibility = InternalRespondToNode.create();
+            dispatchRespondToMissing = InternalRespondToNode.create();
         }
 
         public abstract boolean executeDoesRespondTo(VirtualFrame frame, Object object, Object name,

src/main/java/org/truffleruby/core/objectspace/ObjectSpaceNodes.java

@@ -29,7 +29,7 @@
 import org.truffleruby.language.RubyDynamicObject;
 import org.truffleruby.language.RubyGuards;
 import org.truffleruby.language.control.RaiseException;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 import org.truffleruby.language.objects.IsANode;
 import org.truffleruby.language.objects.ObjectGraph;
 import org.truffleruby.language.objects.ObjectIDOperations;
@@ -196,7 +196,7 @@ public abstract static class DefineFinalizerNode extends CoreMethodArrayArgument
 
         // MRI would do a dynamic call to #respond_to? but it seems better to warn the user earlier.
         // Wanting #method_missing(:call) to be called for a finalizer seems highly unlikely.
-        @Child private DispatchRespondToNode respondToCallNode = DispatchRespondToNode.create();
+        @Child private InternalRespondToNode respondToCallNode = InternalRespondToNode.create();
 
         @Specialization
         protected RubyArray defineFinalizer(VirtualFrame frame, RubyDynamicObject object, Object finalizer,

src/main/java/org/truffleruby/language/ImmutableRubyObject.java

@@ -15,7 +15,7 @@
 import org.truffleruby.interop.ForeignToRubyArgumentsNode;
 import org.truffleruby.interop.ForeignToRubyNode;
 import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 import org.truffleruby.language.library.RubyLibrary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Cached.Exclusive;
@@ -112,13 +112,13 @@ public Object getMembers(boolean internal,
 
     @ExportMessage
     public boolean isMemberReadable(String name,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode) {
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode) {
         return definedNode.execute(null, this, name);
     }
 
     @ExportMessage
     public Object readMember(String name,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
             @Cached ForeignToRubyNode nameToRubyNode,
             @Cached @Exclusive DispatchNode dispatch,
             @Shared("errorProfile") @Cached BranchProfile errorProfile)
@@ -134,7 +134,7 @@ public Object readMember(String name,
 
     @ExportMessage
     public boolean isMemberInvocable(String name,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode) {
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode) {
         return definedNode.execute(null, this, name);
     }
 
@@ -155,8 +155,8 @@ public Object invokeMember(String name, Object[] arguments,
 
     @ExportMessage
     public boolean isMemberInternal(String name,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
-            @Exclusive @Cached(parameters = "PUBLIC") DispatchRespondToNode definedPublicNode) {
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
+            @Exclusive @Cached(parameters = "PUBLIC") InternalRespondToNode definedPublicNode) {
         // defined but not publicly
         return definedNode.execute(null, this, name) &&
                 !definedPublicNode.execute(null, this, name);

src/main/java/org/truffleruby/language/RubyDynamicObject.java

@@ -27,7 +27,7 @@
 import org.truffleruby.interop.TranslateInteropRubyExceptionNode;
 import org.truffleruby.language.control.RaiseException;
 import org.truffleruby.language.dispatch.DispatchNode;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 import org.truffleruby.language.library.RubyLibrary;
 import org.truffleruby.language.objects.LogicalClassNode;
 import org.truffleruby.language.objects.WriteObjectFieldNode;
@@ -375,7 +375,7 @@ private static boolean isIVar(String name) {
     @ExportMessage
     public Object readMember(String name,
             @CachedLibrary("this") DynamicObjectLibrary objectLibrary,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
             @Cached @Shared("nameToRubyNode") ForeignToRubyNode nameToRubyNode,
             @Cached @Exclusive DispatchNode dispatch,
             @Exclusive @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode dispatchNode,
@@ -507,7 +507,7 @@ public Object invokeMember(String name, Object[] arguments,
     @ExportMessage
     public boolean isMemberReadable(String name,
             @CachedLibrary("this") DynamicObjectLibrary objectLibrary,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
             @Exclusive @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode dispatchNode,
             @Cached @Shared("nameToRubyNode") ForeignToRubyNode nameToRubyNode,
             @Exclusive @Cached BooleanCastNode booleanCastNode,
@@ -605,7 +605,7 @@ public boolean isMemberInsertable(String name,
     @ExportMessage
     public boolean isMemberInvocable(String name,
             @CachedLibrary("this") DynamicObjectLibrary objectLibrary,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
             @Exclusive @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode dispatchNode,
             @Cached @Shared("nameToRubyNode") ForeignToRubyNode nameToRubyNode,
             @Exclusive @Cached BooleanCastNode booleanCastNode,
@@ -628,8 +628,8 @@ public boolean isMemberInvocable(String name,
     @ExportMessage
     public boolean isMemberInternal(String name,
             @CachedLibrary("this") DynamicObjectLibrary objectLibrary,
-            @Cached @Shared("definedNode") DispatchRespondToNode definedNode,
-            @Exclusive @Cached(parameters = "PUBLIC") DispatchRespondToNode definedPublicNode,
+            @Cached @Shared("definedNode") InternalRespondToNode definedNode,
+            @Exclusive @Cached(parameters = "PUBLIC") InternalRespondToNode definedPublicNode,
             @Exclusive @Cached(parameters = "PRIVATE_RETURN_MISSING") DispatchNode dispatchNode,
             @Cached @Shared("nameToRubyNode") ForeignToRubyNode nameToRubyNode,
             @Exclusive @Cached BooleanCastNode booleanCastNode,
@@ -685,7 +685,7 @@ public boolean hasMemberWriteSideEffects(String name,
     // region Instantiable
     @ExportMessage
     public boolean isInstantiable(
-            @Exclusive @Cached(parameters = "PUBLIC") DispatchRespondToNode doesRespond) {
+            @Exclusive @Cached(parameters = "PUBLIC") InternalRespondToNode doesRespond) {
         return doesRespond.execute(null, this, "new");
     }
 

src/main/java/org/truffleruby/language/arguments/ReadUserKeywordsHashNode.java

@@ -17,13 +17,13 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.ConditionProfile;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 
 public class ReadUserKeywordsHashNode extends RubyContextSourceNode {
 
     private final int minArgumentCount;
 
-    @Child private DispatchRespondToNode respondToToHashNode;
+    @Child private InternalRespondToNode respondToToHashNode;
     @Child private DispatchNode callToHashNode;
 
     private final ConditionProfile notEnoughArgumentsProfile = ConditionProfile.create();
@@ -68,7 +68,7 @@ private RubyHash tryConvertToHash(VirtualFrame frame, int argumentCount, Object
     private boolean respondToToHash(VirtualFrame frame, Object lastArgument) {
         if (respondToToHashNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            respondToToHashNode = insert(DispatchRespondToNode.create());
+            respondToToHashNode = insert(InternalRespondToNode.create());
         }
         return respondToToHashNode.execute(frame, lastArgument, "to_hash");
     }

src/main/java/org/truffleruby/language/arguments/ShouldDestructureNode.java

@@ -15,12 +15,12 @@
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.profiles.BranchProfile;
-import org.truffleruby.language.dispatch.DispatchRespondToNode;
+import org.truffleruby.language.dispatch.InternalRespondToNode;
 
 
 public class ShouldDestructureNode extends RubyContextSourceNode {
 
-    @Child private DispatchRespondToNode respondToToAry;
+    @Child private InternalRespondToNode respondToToAry;
 
     private final BranchProfile checkIsArrayProfile = BranchProfile.create();
 
@@ -40,7 +40,7 @@ public Object execute(VirtualFrame frame) {
 
         if (respondToToAry == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            respondToToAry = insert(DispatchRespondToNode.create());
+            respondToToAry = insert(InternalRespondToNode.create());
         }
 
         // TODO(cseaton): check this is actually a static "find if there is such method" and not a

src/main/java/org/truffleruby/language/dispatch/DispatchRespondToNode.java renamed to src/main/java/org/truffleruby/language/dispatch/InternalRespondToNode.java

@@ -26,32 +26,32 @@
  * This does NOT call <code>respond_to_missing?</code> on the object, and as such is not a substitute for
  * {@link KernelNodes.RespondToNode} which implements the Ruby <code>Object#respond_to?</code>, and should be used in
  * almost all cases, especially when implementing Ruby methods with Java nodes. */
-public class DispatchRespondToNode extends RubyBaseNode {
+public class InternalRespondToNode extends RubyBaseNode {
 
     // NOTE(norswap): cf. comment above static fields in DispatchNode to see why we need this field
     public static final DispatchConfiguration PUBLIC = DispatchConfiguration.PUBLIC;
 
-    public static DispatchRespondToNode create(DispatchConfiguration config) {
-        return new DispatchRespondToNode(config);
+    public static InternalRespondToNode create(DispatchConfiguration config) {
+        return new InternalRespondToNode(config);
     }
 
-    public static DispatchRespondToNode create() {
-        return new DispatchRespondToNode(DispatchConfiguration.PRIVATE);
+    public static InternalRespondToNode create() {
+        return new InternalRespondToNode(DispatchConfiguration.PRIVATE);
     }
 
-    public static DispatchRespondToNode getUncached(DispatchConfiguration config) {
+    public static InternalRespondToNode getUncached(DispatchConfiguration config) {
         return Uncached.UNCACHED_NODES[config.ordinal()];
     }
 
-    public static DispatchRespondToNode getUncached() {
+    public static InternalRespondToNode getUncached() {
         return getUncached(DispatchConfiguration.PRIVATE);
     }
 
     public final DispatchConfiguration config;
     @Child protected MetaClassNode metaclassNode;
     @Child protected LookupMethodNode methodLookup;
 
-    protected DispatchRespondToNode(
+    protected InternalRespondToNode(
             DispatchConfiguration config,
             MetaClassNode metaclassNode,
             LookupMethodNode methodLookup) {
@@ -60,7 +60,7 @@ protected DispatchRespondToNode(
         this.methodLookup = methodLookup;
     }
 
-    protected DispatchRespondToNode(DispatchConfiguration config) {
+    protected InternalRespondToNode(DispatchConfiguration config) {
         this(config, MetaClassNode.create(), LookupMethodNode.create());
     }
 
@@ -70,7 +70,7 @@ public boolean execute(VirtualFrame frame, Object receiver, String methodName) {
         return method != null && method.isDefined() && method.isImplemented();
     }
 
-    private static class Uncached extends DispatchRespondToNode {
+    private static class Uncached extends InternalRespondToNode {
 
         static final Uncached[] UNCACHED_NODES = new Uncached[DispatchConfiguration.values().length];
         static {