case 0.3 → 0.4

data/Rakefile

@@ -4,7 +4,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'rake/clean'
 
-GEM_VERSION = "0.3"
+GEM_VERSION = "0.4"
 
 Rake::RDocTask.new do |task|
   task.rdoc_files.add [ 'lib/**/*.rb' ]

data/lib/case.rb

@@ -7,61 +7,58 @@
 
 module Case
 
-# Like regular Struct, except that Struct#=== performs a structural match
-class Struct < ::Struct
-  def ===(other)
-    return false unless self.class == other.class
-    zip(other) { |a, b| return false unless a === b }
-    true
+module Impl
+  module Struct
+    def ===(obj)
+      return false unless self.class === obj
+      zip(obj) { |e,o| return false unless e === o }
+      true
+    end
   end
-end
 
-# Pattern-matching disjunction
-class Any
-  class << self
-    alias_method :[], :new
+  module Array
+    def ===(obj)
+      return false unless ::Array === obj
+      zip(obj) { |e,o| return false unless e === o }
+      true
+    end
   end
 
-  def initialize(*options)
-    @options = options
-  end
+  class Operator
+    class << self
+      alias_method :[], :new
+    end
 
-  def ===(obj)
-    @options.any? { |e| e === obj }
+    def initialize(*patterns)
+      @patterns = patterns
+    end
+
+    def ===(obj)
+      raise NotImplementedError, "#{self.class}#=== not implemented"
+    end
   end
 end
 
-# Pattern-matching conjunction
-class All
-  class << self
-    alias_method :[], :new
-  end
-
-  def initialize(*patterns)
-    @patterns = patterns
-  end
+class Any < Impl::Operator
+  def self.===(obj) ; true ; end
 
   def ===(obj)
-    @patterns.all? { |e| e === obj }
+    @patterns.any? { |p| p === obj }
   end
 end
 
-if defined? ::Tuple
-class Tuple < ::Tuple
-  def ===(other)
-    return false unless ::Tuple === other and size == other.size
-    to_a.zip(other) { |a, b| return false unless a === b }
-    true
+class All < Impl::Operator
+  def ===(obj)
+    @patterns.all? { |p| p === obj }
   end
 end
+
+class Struct < ::Struct
+  include Impl::Struct
 end
 
 class Array < ::Array
-  def ===(other)
-    return false unless ::Array === other and size == other.size
-    zip(other) { |a, b| return false unless a === b }
-    true
-  end
+  include Impl::Array
 end
 
 class Guard
@@ -69,8 +66,8 @@ class Guard
     @predicate = predicate
   end
 
-  def ===(other)
-    @predicate.call other
+  def ===(obj)
+    @predicate.call obj
   end
 end
 

data/lib/case/core.rb

@@ -0,0 +1,17 @@
+# case/core.rb - pattern matching for Ruby (core supplement)
+#
+# Copyright 2008  MenTaLguY <mental@rydia.net>
+#
+# This library is made available under the same terms as Ruby.
+#
+
+require 'case'
+
+class Struct
+  include Case::Impl::Struct
+end
+
+class Array
+  include Case::Impl::Array
+end
+

data/test/test_all.rb

@@ -0,0 +1 @@
+require 'test/test_case.rb'

data/test/test_case.rb

@@ -0,0 +1,14 @@
+require 'test/unit'
+require 'case'
+require 'case/core'
+
+class CaseTest < Test::Unit::TestCase
+  def test_struct
+    [ ::Struct, Case::Struct ].each do |s|
+      c = s.new :foo, :bar, :baz
+      assert c[1, 2, Object] === c[1, 2, 3]
+      assert !( c[1, 2, 3] === c[1, 2, Object] )
+    end
+  end
+end
+

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: case
 version: !ruby/object:Gem::Version 
-  version: "0.3"
-date: 2008-01-17 00:00:00 -05:00
+  version: "0.4"
+date: 2008-01-22 00:00:00 -05:00
 summary: Pattern matching for Ruby
 require_paths: 
 - lib
@@ -30,7 +30,9 @@ authors:
 files: 
 - Rakefile
 - test/test_all.rb
+- test/test_case.rb
 - lib/case.rb
+- lib/case/core.rb
 test_files: 
 - test/test_all.rb
 rdoc_options: []