dyoder-functor 0.4.1 → 0.4.2

data/lib/functor.rb

@@ -11,7 +11,7 @@ class Functor
           klass = self.name ; module_eval <<-CODE
             def #{name}( *args, &block ) 
               begin
-                rval = #{klass}.functors[ :#{name} ].apply( self, *args, &block ) 
+                #{klass}.functors[ :#{name} ].apply( self, *args, &block ) 
               rescue ArgumentError => e
                 begin
                   super
@@ -19,11 +19,6 @@ class Functor
                   raise e
                 end
               end
-              if rval.is_a? Continuation
-                super ; rval.call
-              else
-                rval
-              end
             end
           CODE
         end
@@ -42,23 +37,21 @@ class Functor
   end
   
   def apply( object, *args, &block )
-    object.instance_exec( *args, &match( *args, &block ) )
+    object.instance_exec( *args, &match( args, &block ) )
   end
   
   def call( *args, &block )
-    args.push( block ) if block_given?
-    match( *args, &block ).call( *args )
+    match( args, &block ).call( *args )
   end
   
   def to_proc ; lambda { |*args| self.call( *args ) } ; end
   
   private
   
-  def match( *args, &block )
-    args.push( block ) if block_given? 
-    pattern, action = @rules.find { | pattern, action | match?( args, pattern ) }
-    raise ArgumentError.new( "argument mismatch for argument(s): #{ args.map { |arg| arg.inspect }.join(', ') }." ) unless action
-    return action
+  def match( args, &block )
+    args << block if block_given?
+    pattern, action = @rules.find { | p, a | match?( args, p ) }
+    action or raise argument_error( args )
   end
   
   def match?( args, pattern )
@@ -69,4 +62,8 @@ class Functor
     ( rule.is_a?( Proc ) and rule.call( arg ) ) or rule === arg or rule == arg
   end
   
+  def argument_error( args )
+    ArgumentError.new( "argument mismatch for argument(s): #{ args.map{ |arg| arg.inspect }.join(', ') }." )
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dyoder-functor
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Dan Yoder