Truffle::Interop.invoke => Truffle::Interop.invoke_member

Author: eregon

spec/tags/truffle/interop/invoke_tags.txt

@@ -9,14 +9,14 @@
 require_relative '../../ruby/spec_helper'
 require_relative 'fixtures/classes'
 
-describe "Truffle::Interop.invoke" do
+describe "Truffle::Interop.invoke_member" do
 
   it "invokes methods using symbols" do
-    Truffle::Interop.invoke(TruffleInteropSpecs::InvokeTestClass.new, :add, 14, 2).should == 16
+    Truffle::Interop.invoke_member(TruffleInteropSpecs::InvokeTestClass.new, :add, 14, 2).should == 16
   end
 
   it "invokes methods using strings" do
-    Truffle::Interop.invoke(TruffleInteropSpecs::InvokeTestClass.new, 'add', 14, 2).should == 16
+    Truffle::Interop.invoke_member(TruffleInteropSpecs::InvokeTestClass.new, 'add', 14, 2).should == 16
   end
 
   it "raises a NoMethodError when the method is not found on a foreign object" do

spec/truffle/interop/invoke_spec.rb renamed to spec/truffle/interop/invoke_member_spec.rb

@@ -1077,11 +1077,11 @@ protected Nil remove(Object receiver, Object identifier,
     @GenerateUncached
     @GenerateNodeFactory
     @NodeChild(value = "arguments", type = RubyNode[].class)
-    @CoreMethod(names = "invoke", onSingleton = true, required = 2, rest = true)
-    public abstract static class InvokeNode extends RubySourceNode {
+    @CoreMethod(names = "invoke_member", onSingleton = true, required = 2, rest = true)
+    public abstract static class InvokeMemberNode extends RubySourceNode {
 
-        public static InvokeNode create() {
-            return InteropNodesFactory.InvokeNodeFactory.create(null);
+        public static InvokeMemberNode create() {
+            return InteropNodesFactory.InvokeMemberNodeFactory.create(null);
         }
 
         abstract Object execute(Object receiver, Object identifier, Object[] args);

src/main/java/org/truffleruby/interop/InteropNodes.java

@@ -437,7 +437,7 @@ protected Object assignment(Object receiver, String name, Object[] args,
     protected Object readOrInvoke(Object receiver, String name, Object[] args,
             @Cached(value = "name", allowUncached = true) @Shared("name") String cachedName,
             @Cached ToSymbolNode toSymbolNode,
-            @Cached InteropNodes.InvokeNode invokeNode,
+            @Cached InteropNodes.InvokeMemberNode invokeNode,
             @Cached InteropNodes.ReadMemberNode readNode,
             @Cached ConditionProfile invocable,
             @CachedLibrary("receiver") InteropLibrary receivers) {
@@ -466,7 +466,7 @@ protected Object readOrInvoke(Object receiver, String name, Object[] args,
             limit = "1")
     protected Object notOperatorOrAssignment(Object receiver, String name, Object[] args,
             @Cached(value = "name", allowUncached = true) @Shared("name") String cachedName,
-            @Cached InteropNodes.InvokeNode invokeNode) {
+            @Cached InteropNodes.InvokeMemberNode invokeNode) {
         return invokeNode.execute(receiver, name, args);
     }
 
@@ -577,7 +577,7 @@ protected Object callDouble(Object receiver, String name, Object[] args,
                 limit = "getCacheLimit()")
         protected Object call(Object receiver, String name, Object[] args,
                 @CachedLibrary("receiver") InteropLibrary receivers,
-                @Cached InteropNodes.InvokeNode invokeNode) {
+                @Cached InteropNodes.InvokeMemberNode invokeNode) {
             return invokeNode.execute(receiver, name, args);
         }
 

src/main/java/org/truffleruby/interop/OutgoingForeignCallNode.java

@@ -351,7 +351,7 @@ def self.foreign_class(receiver, *args)
           Truffle::Interop.meta_object(receiver)
         end
       else
-        Truffle::Interop.invoke(receiver, :class, *args)
+        Truffle::Interop.invoke_member(receiver, :class, *args)
       end
     end