multimethod 0.0.1 → 0.1.0

data/Manifest.txt

@@ -1,54 +1,21 @@
-./.svn/README.txt
-./.svn/empty-file
-./.svn/entries
-./.svn/format
-./.svn/text-base/ChangeLog.svn-base
-./.svn/text-base/Manifest.txt.svn-base
-./.svn/text-base/README.txt.svn-base
-./.svn/text-base/Rakefile.svn-base
-./.svn/text-base/Releases.txt.svn-base
-./ChangeLog
-./Manifest.txt
-./README.txt
-./Rakefile
-./Releases.txt
-./examples/.svn/README.txt
-./examples/.svn/empty-file
-./examples/.svn/entries
-./examples/.svn/format
-./examples/.svn/props/ex1.rb.svn-work
-./examples/ex1.rb
-./lib/.svn/README.txt
-./lib/.svn/empty-file
-./lib/.svn/entries
-./lib/.svn/format
-./lib/.svn/text-base/multimethod.rb.svn-base
-./lib/multimethod.rb
-./lib/multimethod/.svn/README.txt
-./lib/multimethod/.svn/empty-file
-./lib/multimethod/.svn/entries
-./lib/multimethod/.svn/format
-./lib/multimethod/.svn/text-base/core_extensions.rb.svn-base
-./lib/multimethod/.svn/text-base/method.rb.svn-base
-./lib/multimethod/.svn/text-base/multimethod.rb.svn-base
-./lib/multimethod/.svn/text-base/parameter.rb.svn-base
-./lib/multimethod/.svn/text-base/table.rb.svn-base
-./lib/multimethod/core_extensions.rb
-./lib/multimethod/method.rb
-./lib/multimethod/multimethod.rb
-./lib/multimethod/parameter.rb
-./lib/multimethod/table.rb
-./test/.svn/README.txt
-./test/.svn/empty-file
-./test/.svn/entries
-./test/.svn/format
-./test/.svn/text-base/method_test.rb.svn-base
-./test/.svn/text-base/multimethod_test.rb.svn-base
-./test/.svn/text-base/parameter_test.rb.svn-base
-./test/.svn/text-base/test_base.rb.svn-base
-./test/.svn/text-base/usage_test.rb.svn-base
-./test/method_test.rb
-./test/multimethod_test.rb
-./test/parameter_test.rb
-./test/test_base.rb
-./test/usage_test.rb
+ChangeLog
+Manifest.txt
+README.txt
+Rakefile
+Releases.txt
+examples/ex1.rb
+lib/multimethod.rb
+lib/multimethod/core_extensions.rb
+lib/multimethod/method.rb
+lib/multimethod/multimethod.rb
+lib/multimethod/multimethod_version.rb
+lib/multimethod/parameter.rb
+lib/multimethod/signature.rb
+lib/multimethod/table.rb
+test/add_remove_test.rb
+test/method_test.rb
+test/multimethod_test.rb
+test/parameter_test.rb
+test/signature_test.rb
+test/test_base.rb
+test/usage_test.rb

data/Rakefile

@@ -18,6 +18,7 @@ http://multimethod.rubyforge.org/
 
 }
 
+
 #################################################################
 # Release notes
 #
@@ -44,6 +45,7 @@ def get_release_notes(relfile = "Releases.txt")
     end
   end
 
+  $stderr.puts "Release #{release.inspect}"
   [ release, notes.join('') ]
 end
 
@@ -51,6 +53,8 @@ end
 
 PKG_NAME = PKG_Name.gsub(/[a-z][A-Z]/) {|x| "#{x[0,1]}_#{x[1,1]}"}.downcase
 
+PKG_SVN_ROOT="svn+ssh://rubyforge.org/var/svn/#{PKG_NAME}/#{PKG_NAME}"
+
 release, release_notes = get_release_notes
 
 hoe = Hoe.new(PKG_NAME, release) do |p|
@@ -93,9 +97,15 @@ task :update_version do
   end
 end
 
-task version_rb => :update_version
+# task package => :update_version
+
+#################################################################
+# SVN
+#
 
-# task :test => :update_version
+task :svn_release do
+  sh %{svn cp -m 'Release #{PKG_VERSION}' . #{PKG_SVN_ROOT}/release/#{PKG_VERSION}}
+end
 
 
 # Misc Tasks ---------------------------------------------------------
@@ -130,3 +140,10 @@ task :rubyfiles do
   puts Dir['bin/*'].reject { |fn| fn =~ /CVS|.svn|(~$)|(\.rb$)/ }
 end
 
+task :make_manifest do 
+  open("Manifest.txt", "w") do |f|
+    f.puts Dir['**/*'].reject { |fn| ! test(?f, fn) || fn =~ /CVS|.svn|(~$)/ }.sort.join("\n") + "\n"
+  end
+end
+
+

data/Releases.txt

@@ -1,5 +1,12 @@
 = Multimethod Release History
 
+== Release 0.1.0: 2006/11/24
+
+* Multimethods can be added and removed.
+* Better internal design: signatures vs methods.
+* TODO
+  *  Fix how default parameters are scored.
+
 == Release 0.0.1: 2006/11/18
 
 * Initial Release

data/lib/multimethod.rb

@@ -4,5 +4,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'multimethod/table'
 require 'multimethod/multimethod'
 require 'multimethod/method'
+require 'multimethod/signature'
 require 'multimethod/parameter'
 require 'multimethod/core_extensions'

data/lib/multimethod/core_extensions.rb

@@ -25,11 +25,16 @@ module Multimethod
         ::Multimethod::Table.instance.install_method(self, body, file, line)
       end
     end
+
+    def remove_multimethod(signature)
+      ::Multimethod::Table.instance.remove_method(signature)
+    end
+
   end # class
 end # module
 
 
-# Add to Module
+# Add to Object
 Object.class_eval do
   include Multimethod::ObjectExtension
 end

data/lib/multimethod/method.rb

@@ -1,227 +1,85 @@
 module Multimethod
 
   class Method
-    attr_accessor :mod
-    attr_accessor :name
-    attr_accessor :parameter
-
-    attr_accessor :min_args
-    attr_accessor :max_args
-    attr_accessor :restarg
-    attr_accessor :default
+    attr_accessor :signature
+    attr_accessor :impl_name
 
     attr_accessor :multimethod
-    attr_accessor :file
-    attr_accessor :line
-
-    def initialize(mod, name, params)
-      raise NameError, "multimethod method name not specified" unless name && name.to_s.size > 0
-
-      name = Multimethod.normalize_name(name)
 
-      @mod = mod
-      @name = name
-      @parameter = [ ]
-      @min_args = 0
-      @max_args = 0
-      @restarg = nil
-      @default = nil
-
-      @score = { }
+    def initialize(impl_name, *args)
+      if args.size == 1
+        @signature = args[0]
+      else
+        mod, name, params = *args
+        raise NameError, "multimethod method name not specified" unless name && name.to_s.size > 0
+        raise NameError, "multimethod method impl_name not specified" unless impl_name && impl_name.to_s.size > 0
+        
+        @signature = Signature.new(:mod => mod, :name => name, :parameter => params)
+      end
 
-      # Add self parameter at front.
-      add_parameter(Parameter.new('self', mod))
+      impl_name = Multimethod.normalize_name(impl_name)
 
-      # Handle other parameters.
-      case params
-      when Array
-        scan_parameters(params)
-      when String
-        scan_parameters_string(params)
-      end
+      @impl_name = impl_name
     end
     
 
-    # For sort
-    def <=>(x)
-      0
+    def matches_signature(signature)
+      @signature == signature
     end
 
 
-    def scan_parameters_string(params)
-
-      #$stderr.puts "scan_parameters_string(#{params.inspect})"
-
-      str = params.clone
+    def remove_implementation
+      # Remove the method implementation
+      # $stderr.puts "Removing implementation for #{signature.to_s} => #{impl_name}"
+      signature.mod.class_eval("remove_method #{impl_name.inspect}")
+    end
 
-      until str.empty?
-        name = nil
-        type = nil
-        default = nil
-        
-        str.sub!(/^\s+/, '')
 
-        # $stderr.puts "  str=#{str.inspect}"
-        
-        if md = /^(\w+(::\w+)*)\s+(\w+)/i.match(str)
-          str = md.post_match
-          type = md[1]
-          name = md[3]
-        elsif md = /^(\*?\w+)/i.match(str)
-          str = md.post_match
-          type = nil
-          name = md[1]
-        else
-          raise NameError, "Syntax error in multimethod parameters: #{params.inspect} before #{str.inspect}"
-        end
-        
-        if md = /^\s*=\s*([^,]+)/.match(str)
-          str = md.post_match
-          default = md[1]
-        end
-        
-        
-        str.sub!(/^\s+/, '')
-        if ! str.empty? 
-          if md = /^,/.match(str)
-            str = md.post_match
-          else
-            raise NameError, "Syntax error in multimethod parameters: expected ',' before #{str.inspect}"
-          end
-        end
-        
-        p = Parameter.new(name, type, default)
-        add_parameter(p)
-      end
+    # For score sort
+    def <=>(x)
+      0
     end
 
 
-    def scan_parameters(params)
-      until params.empty?
-        name = nil
-        type = nil
-        restarg = false
-        default = nil
-        
-        if x = params.shift
-          case x
-          when Class
-            type = x
-          else
-            name = x
-          end
-        end
-
-        if ! name && (x = params.shift)
-          name = x
-        end
-
-        raise("Parameter name expected, found #{name.inspect}") unless name.kind_of?(String) || name.kind_of?(Symbol)
-        raise("Parameter type expected, found #{type.inspect}") unless type.kind_of?(Module) || type.nil?
-
-        p = Parameter.new(name, type, default)
-        add_parameter(p)
-      end
-
+    # Parameters
+    def parameter
+      @signature.parameter
     end
-    
-    def add_parameter(p)
-      if p.restarg
-        raise("Too many restargs") if @restarg
-        @restarg = p
-        @max_args = nil
-      end
-      if p.default
-        (@default ||= [ ]).push(p)
-      end
 
-      p.i = @parameter.size
-      @parameter.push(p)
-      p.method = self
 
-      unless p.default || p.restarg
-        @min_args = @parameter.size
-      end
-
-      unless @restarg
-        @max_args = @parameter.size
-      end
+    # Scoring this method.
+    def score(args)
+      @signature.score(args)
     end
 
 
     def score_cached(args)
-      unless x = @score[args]
-        x = @score[args] =
-          score(args)
-      end
-      x
+      @signature.score_cached(args)
     end
 
 
-    def score(args)
-      
-      if @min_args > args.size
-        # Not enough args
-        score = nil
-      elsif @max_args && @max_args < args.size
-        # Too many args?
-        # $stderr.puts "max_args = #{@max_args}, args.size = #{args.size}"
-        score = nil
-      else
-        # Interpret how close the argument type is to the parameter's type.
-        i = -1
-        score = args.collect{|a| parameter_at(i = i + 1).score(a)}
-
-        # Handle score for trailing restargs.
-        if @restarg || @default
-          while (i = i + 1) < @parameter.size
-            # $stderr.puts "  Adding score i=#{i}"
-            score << parameter_at(i).score(NilClass)
-          end
-        end
-
-        # If any argument cannot match, avoid this method.
-        score = nil if score.index(nil)
-      end
+    def to_s(name = nil)
+      name ||= @impl_name
+      @signature.to_s(name)
+    end
 
-      # if true || @name =~ /_bar$/
-      #   $stderr.puts "    Method: score #{self.to_s} #{args.inspect} => #{score.inspect}"
-      # end
 
-      score
+    def to_ruby_def(name = nil)
+      name ||= @impl_name
+      @signature.to_ruby_def(name)
     end
-    
 
-    def parameter_at(i)
-      if i >= @parameter.size && @restarg
-        @restarg
-      else
-        @parameter[i]
-      end
-    end
 
- 
-    def parameter_to_s(p = nil)
-      p ||= @parameter
-      p.collect{|x| x.to_s_long}.join(', ')
+    def to_ruby_signature(name = nil)
+      name ||= @impl_name
+      @signature.to_ruby_signature(name)
     end
 
-    def to_s(name = nil)
-      name ||= @name
-      p = @parameter.clone
-      rcvr = p.shift
-      "#{rcvr.type.name}##{name}(#{parameter_to_s(p)})"
-    end
 
-    def to_ruby
-      "def #{name}(#{to_s_arg})"
+    def to_ruby_arg
+      @signature.to_ruby_arg
     end
 
-    def to_s_arg
-      x = @parameter.clone
-      x.shift
-      x.collect{|x| x.to_ruby}.join(', ')
-    end
 
     def inspect
       to_s

data/lib/multimethod/multimethod.rb

@@ -23,8 +23,15 @@ module Multimethod
     end
 
 
-    def new_method(mod, *args)
-      m = Method.new(mod, gensym, *args)
+    def new_method(mod, name, *args)
+      m = Method.new(gensym(name), mod, name, *args)
+      add_method(m)
+      m
+    end
+
+
+    def new_method_from_signature(signature)
+      m = Method.new(gensym(name), signature)
       add_method(m)
       m
     end
@@ -32,6 +39,7 @@ module Multimethod
 
     def add_method(method)
       # THREAD CRITICAL BEGIN
+      remove_method(method.signature)
       @method.push(method)
       method.multimethod = self
       @lookup_method = { } # flush cache
@@ -39,6 +47,41 @@ module Multimethod
     end
 
 
+    def matches_signature(signature)
+      @name == signature.name
+    end
+
+
+    def find_method(signature)
+      m = @method.select{|x| x.matches_signature(signature)}
+
+      m
+    end
+
+
+    def remove_method(x)
+      case x
+      when Signature
+        m = find_method(x) 
+        m = m[0]
+        return unless m
+        raise("No method found for #{x.to_s}") unless m
+      else
+        m = x
+      end
+
+      m.remove_implementation
+      m.multimethod = nil
+      @method.delete(m)
+      @lookup_method = { } # flush cache
+
+      # Remove multimethod dispatch in the method's module?
+      if @method.collect{|x| m.signature.mod = m.signature.mod}.empty?
+        remove_dispatch(m.signature.mod)
+      end
+    end
+
+
     def dispatch(rcvr, args)
       apply_method(lookup_method(rcvr, args), rcvr, args)
     end
@@ -52,7 +95,7 @@ module Multimethod
         $stderr.puts "\n"
       end
       raise NameError, "Cannot find multimethod for #{rcvr.class.name}##{@name}(#{args})" unless meth
-      rcvr.send(meth.name, *args)
+      rcvr.send(meth.impl_name, *args)
     end
 
 
@@ -95,6 +138,7 @@ module Multimethod
       result
     end
 
+
     def score_methods(meths, args)
       scores = meths.collect do |meth|
         score = meth.score_cached(args)
@@ -116,6 +160,17 @@ module Multimethod
     end
 
 
+    def remove_dispatch(mod)
+      # THREAD CRITICAL BEGIN
+      if @dispatch[mod]
+        @dispatch[mod] = false
+        # $stderr.puts "Removing dispatch for #{mod.name}##{name}"
+        mod.class_eval("remove_method #{name.inspect}")
+      end
+      # THREAD CRITICAL END
+    end
+
+
     def install_dispatch(mod)
       # THREAD CRITICAL BEGIN
       unless @dispatch[mod]