jruby · Jan 15, 2015 · Jan 15, 2015 · Jan 15, 2015
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/MethodNodes.java
@@ -14,12 +14,10 @@
 import com.oracle.truffle.api.frame.VirtualFrame;
 import com.oracle.truffle.api.nodes.IndirectCallNode;
 import com.oracle.truffle.api.source.SourceSection;
-import org.jruby.truffle.nodes.yield.YieldDispatchHeadNode;
 import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
-import org.jruby.truffle.runtime.UndefinedPlaceholder;
 import org.jruby.truffle.runtime.core.RubyMethod;
-import org.jruby.truffle.runtime.core.RubyProc;
+import org.jruby.truffle.runtime.core.RubySymbol;
 import org.jruby.truffle.runtime.methods.InternalMethod;
 
 @CoreClass(name = "Method")
@@ -57,4 +55,24 @@ public Object call(VirtualFrame frame, RubyMethod method, Object... arguments) {
 
     }
 
+    @CoreMethod(names = "name")
+    public abstract static class NameNode extends CoreMethodNode {
+
+        public NameNode(RubyContext context, SourceSection sourceSection) {
+            super(context, sourceSection);
+        }
+
+        public NameNode(NameNode prev) {
+            super(prev);
+        }
+
+        @Specialization
+        public RubySymbol name(RubyMethod method) {
+            notDesignedForCompilation();
+
+            return getContext().newSymbol(method.getMethod().getName());
+        }
+
+    }
+
 }
diff --git a/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java b/core/src/main/java/org/jruby/truffle/nodes/core/ModuleNodes.java
@@ -760,6 +760,15 @@ public RubySymbol defineMethod(RubyModule module, RubySymbol name, RubyProc proc
             return name;
         }
 
+        @Specialization
+        public RubySymbol defineMethod(RubyModule module, RubySymbol name, RubyMethod method, UndefinedPlaceholder block) {
+            notDesignedForCompilation();
+
+            module.addMethod(this, method.getMethod().withNewName(name.toString()));
+
+            return name;
+        }
+
         private void defineMethod(RubyModule module, RubySymbol name, RubyProc proc) {
             notDesignedForCompilation();
 

diff --git a/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/kernel.rb b/core/src/main/ruby/jruby/truffle/core/rubinius/kernel/common/kernel.rb
@@ -69,4 +69,8 @@ def StringValue(obj)
   end
   module_function :StringValue
 
+  def define_singleton_method(*args, &block)
+    singleton_class.send(:define_method, *args, &block)
+  end
+
 end
diff --git a/spec/truffle/tags/core/kernel/define_singleton_method_tags.txt b/spec/truffle/tags/core/kernel/define_singleton_method_tags.txt
@@ -1,8 +1,2 @@
-fails:Kernel#define_singleton_method defines a new method with the given name and the given block as body in self
-fails:Kernel#define_singleton_method raises a TypeError when the given method is no Method/Proc
-fails:Kernel#define_singleton_method defines a new singleton method for objects
-fails:Kernel#define_singleton_method maintains the Proc's scope
-fails:Kernel#define_singleton_method when given an UnboundMethod correctly calls the new method
-fails:Kernel#define_singleton_method when given an UnboundMethod adds the new method to the methods list
 fails:Kernel#define_singleton_method when given an UnboundMethod defines any Child class method from any Parent's class methods
 fails:Kernel#define_singleton_method when given an UnboundMethod will raise when attempting to define an object's singleton method from another object's singleton method
diff --git a/spec/truffle/tags/core/method/name_tags.txt b/spec/truffle/tags/core/method/name_tags.txt
@@ -1,3 +1,2 @@
-fails:Method#name returns the name of the method
 fails:Method#name returns the name even when aliased
 fails:Method#name for a Method generated by respond_to_missing? returns the name passed to respond_to_missing?
diff --git a/spec/truffle/tags/core/module/define_method_tags.txt b/spec/truffle/tags/core/module/define_method_tags.txt
@@ -1,46 +1,11 @@
-fails:passed { |a, b = 1|  } creates a method that raises an ArgumentError when passed zero arguments
-fails:passed { |a, b = 1|  } creates a method that has a default value for b when passed one argument
-fails:passed { |a, b = 1|  } creates a method that overrides the default argument when passed two arguments
-fails:passed { |a, b = 1|  } creates a method that raises an ArgumentError when passed three arguments
 fails:Module#define_method when given an UnboundMethod passes the given arguments to the new method
 fails:Module#define_method when given an UnboundMethod adds the new method to the methods list
 fails:Module#define_method when given an UnboundMethod defining a method on a singleton class doesn't raise TypeError when calling the method
 fails:Module#define_method defines the given method as an instance method with the given name in self
 fails:Module#define_method calls #method_added after the method is added to the Module
-fails:Module#define_method raises a TypeError when the given method is no Method/Proc
 fails:Module#define_method raises an ArgumentError when no block is given
-fails:Module#define_method raises a RuntimeError if frozen
-fails:Module#define_method accepts a Method (still bound)
-fails:Module#define_method accepts a String method name
 fails:Module#define_method is private
 fails:Module#define_method method body is an UnboundMethod allows methods defined on a different object
-fails:Module#define_method passed {  } creates a method that returns the value computed by the block when passed zero arguments
-fails:Module#define_method passed {  } creates a method that raises an ArgumentError when passed one argument
-fails:Module#define_method passed {  } creates a method that raises an ArgumentError when passed two arguments
-fails:Module#define_method passed { ||  } creates a method that returns the value computed by the block when passed zero arguments
-fails:Module#define_method passed { ||  } creates a method that raises an ArgumentError when passed one argument
-fails:Module#define_method passed { ||  } creates a method that raises an ArgumentError when passed two arguments
-fails:Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed zero arguments
-fails:Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed zero arguments and a block
-fails:Module#define_method passed { |a|  } creates a method that raises an ArgumentError when passed two arguments
-fails:Module#define_method passed { |a|  } creates a method that receives the value passed as the argument when passed one argument
-fails:Module#define_method passed { |*a|  } creates a method that receives an empty array as the argument when passed zero arguments
-fails:Module#define_method passed { |*a|  } creates a method that receives the value in an array when passed one argument
-fails:Module#define_method passed { |*a|  } creates a method that receives the values in an array when passed two arguments
-fails:Module#define_method passed { |a, *b|  } creates a method that raises an ArgumentError when passed zero arguments
-fails:Module#define_method passed { |a, *b|  } creates a method that returns the value computed by the block when passed one argument
-fails:Module#define_method passed { |a, *b|  } creates a method that returns the value computed by the block when passed two arguments
-fails:Module#define_method passed { |a, *b|  } creates a method that returns the value computed by the block when passed three arguments
-fails:Module#define_method passed { |a, b|  } creates a method that returns the value computed by the block when passed two arguments
-fails:Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed zero arguments
-fails:Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed one argument
-fails:Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed one argument and a block
-fails:Module#define_method passed { |a, b|  } creates a method that raises an ArgumentError when passed three arguments
-fails:Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed zero arguments
-fails:Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed one argument
-fails:Module#define_method passed { |a, b, *c|  } creates a method that raises an ArgumentError when passed one argument and a block
-fails:Module#define_method passed { |a, b, *c|  } creates a method that receives an empty array as the third argument when passed two arguments
-fails:Module#define_method passed { |a, b, *c|  } creates a method that receives the third argument in an array when passed three arguments
 fails:Module#define_method when name is :initialize given an UnboundMethod sets the visibility to private when method is named :initialize
 fails:Method#define_method when passed a Method object defines a method with the same #arity as the original
 fails:Method#define_method when passed a Method object defines a method with the same #parameters as the original