jruby · Jul 10, 2015 · Jul 10, 2015
Showing with 32 additions and 14 deletions.

+0 −13 spec/truffle/tags/core/kernel/public_send_tags.txt

+31 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java

+1 −1 truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
diff --git a/spec/truffle/tags/core/kernel/public_send_tags.txt b/spec/truffle/tags/core/kernel/public_send_tags.txt
@@ -1,16 +1,3 @@
-fails:Kernel#public_send invokes the named public method
-fails:Kernel#public_send invokes the named alias of a public method
-fails:Kernel#public_send invokes the named method
-fails:Kernel#public_send accepts a String method name
-fails:Kernel#public_send invokes a class method if called on a class
-fails:Kernel#public_send raises an ArgumentError if called with fewer arguments than required parameters
-fails:Kernel#public_send succeeds if passed an arbitrary number of arguments as a splat parameter
-fails:Kernel#public_send succeeds when passing 1 or more arguments as a required and a splat parameter
-fails:Kernel#public_send succeeds when passing 0 arguments to a method with one parameter with a default
 fails:Kernel#public_send has an arity of -1
 fails:Kernel#public_send raises a NoMethodError if the method is protected
-fails:Kernel#public_send raises a NoMethodError if the named method is private
-fails:Kernel#public_send raises a NoMethodError if the named method is an alias of a private method
 fails:Kernel#public_send raises a NoMethodError if the named method is an alias of a protected method
-fails:Kernel#public_send raises a NameError if the corresponding method can't be found
-fails:Kernel#public_send raises a NameError if the corresponding singleton method can't be found
diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/KernelNodes.java
@@ -1303,6 +1303,37 @@ public RubyBasicObject publicMethods(VirtualFrame frame, Object self, boolean in
 
     }
 
+    @CoreMethod(names = "public_send", needsBlock = true, required = 1, argumentsAsArray = true)
+    public abstract static class PublicSendNode extends CoreMethodArrayArgumentsNode {
+
+        @Child private CallDispatchHeadNode dispatchNode;
+
+        public PublicSendNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+
+            dispatchNode = new CallDispatchHeadNode(context, false,
+                    DispatchNode.DISPATCH_METAPROGRAMMING_ALWAYS_INDIRECT,
+                    MissingBehavior.CALL_METHOD_MISSING);
+
+            if (DispatchNode.DISPATCH_METAPROGRAMMING_ALWAYS_UNCACHED) {
+                dispatchNode.forceUncached();
+            }
+        }
+
+        @Specialization
+        public Object send(VirtualFrame frame, Object self, Object[] args, NotProvided block) {
+            return send(frame, self, args, (RubyProc) null);
+        }
+
+        @Specialization
+        public Object send(VirtualFrame frame, Object self, Object[] args, RubyProc block) {
+            final Object name = args[0];
+            final Object[] sendArgs = ArrayUtils.extractRange(args, 1, args.length);
+            return dispatchNode.call(frame, self, name, block, sendArgs);
+        }
+
+    }
+
     @CoreMethod(names = "rand", isModuleFunction = true, optional = 1)
     public abstract static class RandNode extends CoreMethodArrayArgumentsNode {
 

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java b/truffle/src/main/java/org/jruby/truffle/runtime/core/CoreLibrary.java
@@ -1007,7 +1007,7 @@ public RubyException noMethodErrorOnReceiver(String name, Object receiver, Node
 
     public RubyException privateMethodError(String name, RubyModule module, Node currentNode) {
         CompilerAsserts.neverPartOfCompilation();
-        return noMethodError(String.format("private method `%s' called for %s", name, module.toString()), name, currentNode);
+        return noMethodError(String.format("private method `%s' called for %s", name, module.getName()), name, currentNode);
     }
 
     public RubyException loadError(String message, Node currentNode) {