Implement Module#instance_method and fix Method and UnboundMethod

opal · Oct 1, 2013 · ea98c15 · DouweM · Oct 1, 2013 · meh
1 parent db1091c
commit ea98c15
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 11 deletions.
diff --git a/corelib/kernel.rb b/corelib/kernel.rb
@@ -32,18 +32,13 @@ def <=>(other)
 
   def method(name)
     %x{
-      var recv = #{self},
-          meth = recv['$' + name],
-          func = function() {
-            return meth.apply(recv, $slice.call(arguments, 0));
-          };
-
-      if (!meth) {
-        #{ raise NameError };
+      var meth = self['$' + name];
+
+      if (!meth || meth.rb_stub) {
+        #{raise NameError, "undefined method `#{name}' for class `#{self.class.name}'"};
       }
 
-      func._klass = #{Method};
-      return func;
+      return #{Method.new(self, `meth`, name)};
     }
   end
 

diff --git a/corelib/module.rb b/corelib/module.rb
@@ -312,6 +312,18 @@ def include(*mods)
     }
   end
 
+  def instance_method(name)
+    %x{
+      var meth = self._proto['$' + name];
+
+      if (!meth || meth.rb_stub) {
+        #{raise NameError, "undefined method `wut' for class `#{name}'"};
+      }
+
+      return #{UnboundMethod.new(self, `meth`, name)};
+    }
+  end
+
   def instance_methods(include_super = false)
     %x{
       var methods = [], proto = #{self}._proto;

diff --git a/corelib/proc.rb b/corelib/proc.rb
@@ -52,4 +52,61 @@ def to_n
   end
 end
 
-class Method < Proc; end
+class Method
+  attr_reader :owner, :receiver, :name
+
+  def initialize(receiver, method, name)
+    @receiver = receiver
+    @owner    = receiver.class
+    @name     = name
+    @method   = method
+  end
+
+  def arity
+    @method.arity
+  end
+
+  def call(*args, &block)
+    %x{
+      #@method._p = block;
+
+      return #@method.apply(#@object, args);
+    }
+  end
+
+  alias [] call
+
+  def unbind
+    UnboundMethod.new(@owner, @method, @name)
+  end
+
+  def to_proc
+    @method
+  end
+
+  def inspect
+    "#<Method: #{@obj.class.name}##@name}>"
+  end
+end
+
+class UnboundMethod
+  attr_reader :owner, :name
+
+  def initialize(owner, method, name)
+    @owner  = owner
+    @method = method
+    @name   = name
+  end
+
+  def arity
+    @method.arity
+  end
+
+  def bind(object)
+    Method.new(object, @method, @name)
+  end
+
+  def inspect
+    "#<UnboundMethod: #{@owner.name}##@name>"
+  end
+end