Merge branch 'master' into i110/inspect-recursion

2 files changed, 11 insertions, 2 deletions

diff --git a/mrbgems/mruby-method/mrblib/kernel.rb b/mrbgems/mruby-method/mrblib/kernel.rb
index b2ebd45ea..eb17df5a6 100644
--- a/mrbgems/mruby-method/mrblib/kernel.rb
+++ b/mrbgems/mruby-method/mrblib/kernel.rb
@@ -1,8 +1,9 @@
 module Kernel
   def singleton_method(name)
     m = method(name)
-    if m.owner != singleton_class
-      raise NameError, "undefined method `#{name}' for class `#{singleton_class}'"
+    sc = (class <<self; self; end)
+    if m.owner != sc
+      raise NameError, "undefined method '#{name}' for class '#{sc}'"
     end
     m
   end
diff --git a/mrbgems/mruby-method/mrblib/method.rb b/mrbgems/mruby-method/mrblib/method.rb
index 5de0afdf7..f7cefa2e5 100644
--- a/mrbgems/mruby-method/mrblib/method.rb
+++ b/mrbgems/mruby-method/mrblib/method.rb
@@ -17,4 +17,12 @@ class Method
   def name
     @name
   end
+
+  def <<(other)
+    ->(*args, &block) { call(other.call(*args, &block)) }
+  end
+
+  def >>(other)
+    ->(*args, &block) { other.call(call(*args, &block)) }
+  end
 end