0
@@ -17,8 +17,15 @@ class Functor
0
       end
0
       def k.functor( name, *args, &block )
0
         name = name.to_sym
0
-        ( f = ( functors[ name ] or ( functors[ name ] = Functor.new ) ) ).given( *args, &block )
0
-        define_method( name ) { | *args | f.apply( self, *args ) } 
0
+        ( f = ( functors[ name ] or 
0
+          ( functors[ name ] = Functor.new ) ) ).given( *args, &block )
0
+        define_method( name ) { | *args | instance_exec( *args, &f.match( *args ) ) } 
0
+      end
0
+      def k.functor_with_self( name, *args, &block )
0
+        name = name.to_sym
0
+        ( f = ( functors[ name ] or 
0
+          ( functors[ name ] = Functor.new ) ) ).given( *args, &block )
0
+        define_method( name ) { | *args | instance_exec( *args, &f.match( self, *args ) ) } 
0
       end
0
     end
0
   end
0
@@ -30,24 +37,14 @@ class Functor
0
   
0
   def initialize_copy( from )
0
     @rules = from.instance_eval { @rules.clone }
0
-    # @rules = from.instance_eval do
0
-    #   @rules.inject( [] ) do | rules, rule |
0
-    #     pattern, action = rule
0
-    #     rules << [ pattern.clone, rule ]
0
-    #   end
0
-    # end
0
   end
0
   
0
   def given( *pattern, &action )
0
     @rules << [ pattern, action ]
0
   end
0
   
0
-  def apply( object, *args, &block )
0
-    object.instance_exec( *args, &match( args, &block ) )
0
-  end
0
-  
0
   def call( *args, &block )
0
-    match( args, &block ).call( *args )
0
+    match( *args, &block ).call( *args )
0
   end
0
   
0
   def []( *args, &block )
0
@@ -56,7 +53,7 @@ class Functor
0
   
0
   def to_proc ; lambda { |*args| self.call( *args ) } ; end
0
     
0
-  def match( args, &block )
0
+  def match( *args, &block )
0
     args << block if block_given?
0
     pattern, action = @rules.reverse.find { | p, a | match?( args, p ) }
0
     action or argument_error( args )
0
@@ -69,7 +66,7 @@ class Functor
0
   end
0
   
0
   def pair?( arg, rule )
0
-    ( rule.respond_to? :call and rule.call( arg ) ) or rule === arg or rule == arg
0
+    ( rule.respond_to? :call and rule.call( arg ) ) or rule === arg
0
   end
0
   
0
   def argument_error( args )

0
@@ -9,7 +9,6 @@ end
0
 
0
 class B < A
0
   functor( :foo, String ) { |s| [ B, String ] }
0
-  functor( :foo, Float ) { |f| [ B, *A.functors[:foo].apply( self, f ) ] }
0
 end
0
 
0
 describe "Functor methods should support inheritance" do
0
@@ -22,7 +21,4 @@ describe "Functor methods should support inheritance" do
0
     B.new.foo( "bar" ).should == [ B, String ]
0
   end
0
   
0
-  specify "by allowing you to call base class functors using #functors" do
0
-    B.new.foo( 1.0 ).should == [ B, A, Float ]
0
-  end
0
 end