pattern-match 0.1.0 → 0.1.1

data/lib/pattern-match.rb

@@ -26,8 +26,11 @@ module PatternMatch
       if Object == self
         raise MalformedPatternError unless subpatterns.length == 1
         PatternObject.new(subpatterns[0])
+      elsif Hash == self
+        raise MalformedPatternError unless subpatterns.length == 1
+        PatternHash.new(subpatterns[0])
       else
-        PatternExtractor.new(self, *subpatterns)
+        PatternDeconstructor.new(self, *subpatterns)
       end
     end
 
@@ -47,7 +50,7 @@ module PatternMatch
       private
 
       def accept_self_instance_only(val)
-        raise PatternNotMatch unless val.is_a?(self)
+        raise PatternNotMatch unless val.kind_of?(self)
       end
     end
 
@@ -141,7 +144,7 @@ module PatternMatch
       @next = nil
       @prev = nil
       @pattern_match_env = nil
-      @subpatterns = subpatterns.map {|i| i.is_a?(Pattern) ? i : PatternValue.new(i) }
+      @subpatterns = subpatterns.map {|i| i.kind_of?(Pattern) ? i : PatternValue.new(i) }
       set_subpatterns_relation
     end
 
@@ -170,7 +173,7 @@ module PatternMatch
     end
 
     def quantified?
-      @next.is_a?(PatternQuantifier) || (root? ? false : @parent.quantified?)
+      @next.kind_of?(PatternQuantifier) || (root? ? false : @parent.quantified?)
     end
 
     def root?
@@ -182,7 +185,7 @@ module PatternMatch
         dup_vars = vars - vars.uniq {|i| i.name }
         raise MalformedPatternError, "duplicate variables: #{dup_vars.map(&:name).join(', ')}" unless dup_vars.empty?
       end
-      raise MalformedPatternError if @subpatterns.count {|i| i.is_a?(PatternQuantifier) } > 1
+      raise MalformedPatternError if @subpatterns.count {|i| i.kind_of?(PatternQuantifier) } > 1
       @subpatterns.each(&:validate)
     end
 
@@ -215,7 +218,6 @@ module PatternMatch
 
   class PatternObject < Pattern
     def initialize(spec)
-      raise MalformedPatternError unless spec.is_a?(Hash)
       super(*spec.values)
       @spec = spec.map {|k, pat| [k.to_proc, pat] }
     rescue
@@ -227,7 +229,20 @@ module PatternMatch
     end
   end
 
-  class PatternExtractor < Pattern
+  class PatternHash < Pattern
+    def initialize(spec)
+      super(*spec.values)
+      @spec = spec
+    end
+
+    def match(val)
+      raise PatternNotMatch unless val.kind_of?(Hash)
+      raise PatternNotMatch unless @spec.keys.all? {|k| val.has_key?(k) }
+      @spec.all? {|k, pat| pat.match(val[k]) rescue raise PatternNotMatch }
+    end
+  end
+
+  class PatternDeconstructor < Pattern
     def initialize(extractor, *subpatterns)
       super(*subpatterns)
       @extractor = extractor
@@ -236,7 +251,7 @@ module PatternMatch
     def match(val)
       extracted_vals = pattern_match_env.call_refined_method(@extractor, :deconstruct, val)
       k = extracted_vals.length - (@subpatterns.length - 2)
-      quantifier = @subpatterns.find {|i| i.is_a?(PatternQuantifier) }
+      quantifier = @subpatterns.find {|i| i.kind_of?(PatternQuantifier) }
       if quantifier
         return false unless quantifier.min_k <= k
       else
@@ -244,9 +259,9 @@ module PatternMatch
       end
       @subpatterns.flat_map do |pat|
         case
-        when pat.next.is_a?(PatternQuantifier)
+        when pat.next.kind_of?(PatternQuantifier)
           []
-        when pat.is_a?(PatternQuantifier)
+        when pat.kind_of?(PatternQuantifier)
           pat.prev.vars.each {|v| v.set_bind_to(pat) }
           Array.new(k, pat.prev)
         else
@@ -273,7 +288,7 @@ module PatternMatch
     def validate
       super
       raise MalformedPatternError unless @prev
-      raise MalformedPatternError unless @parent.is_a?(PatternExtractor)
+      raise MalformedPatternError unless @parent.kind_of?(PatternDeconstructor)
     end
   end
 
@@ -320,7 +335,7 @@ module PatternMatch
     end
 
     def nest_level(quantifier)
-      qs = ancestors.map {|i| i.next.is_a?(PatternQuantifier) ? i.next : nil }.find_all {|i| i }.reverse
+      qs = ancestors.map {|i| i.next.kind_of?(PatternQuantifier) ? i.next : nil }.find_all {|i| i }.reverse
       qs.index(quantifier) || (raise PatternMatchError)
     end
   end
@@ -374,24 +389,22 @@ module PatternMatch
   end
 
   class Env < BasicObject
-    attr_reader :ret
-
     def initialize(ctx, val)
       @ctx = ctx
       @val = val
-      @matched = false
-      @ret = nil
     end
 
     private
 
     def with(pat_or_val, guard_proc = nil, &block)
-      pat = pat_or_val.is_a?(Pattern) ? pat_or_val : PatternValue.new(pat_or_val)
+      pat = pat_or_val.kind_of?(Pattern) ? pat_or_val : PatternValue.new(pat_or_val)
       pat.validate
       pat.pattern_match_env = self
-      if (! @matched) and pat.match(@val) and (guard_proc ? with_tmpbinding(@ctx, pat.binding, &guard_proc) : true)
-        @matched = true
-        @ret = with_tmpbinding(@ctx, pat.binding, &block)
+      if pat.match(@val) and (guard_proc ? with_tmpbinding(@ctx, pat.binding, &guard_proc) : true)
+        ret = with_tmpbinding(@ctx, pat.binding, &block)
+        ::Kernel.throw(:exit_match, ret)
+      else
+        nil
       end
     rescue PatternNotMatch
     end
@@ -468,13 +481,19 @@ module PatternMatch
     end
 
     def tmpbinding_module(obj)
-      m = obj.singleton_class.ancestors.find {|i| i.is_a? TmpBindingModule }
+      m = obj.singleton_class.ancestors.find {|i| i.kind_of?(TmpBindingModule) }
       unless m
         m = TmpBindingModule.new
         m.instance_eval do
           @stacks = ::Hash.new {|h, k| h[k] = [] }
         end
-        obj.extend(m)
+        obj.singleton_class.class_eval do
+          if respond_to?(:prepend, true)
+            prepend m
+          else
+            include m
+          end
+        end
       end
       m
     end
@@ -482,7 +501,20 @@ module PatternMatch
 
   class PatternNotMatch < Exception; end
   class PatternMatchError < StandardError; end
+  class NoMatchingPatternError < PatternMatchError; end
   class MalformedPatternError < PatternMatchError; end
+
+  # Make Pattern and its subclasses/Env private.
+  if respond_to?(:private_constant)
+    constants.each do |c|
+      klass = const_get(c)
+      next unless klass.kind_of?(Class)
+      if klass.ancestors.find {|i| i == Pattern }
+        private_constant c
+      end
+    end
+    private_constant :Env
+  end
 end
 
 module Kernel
@@ -490,7 +522,7 @@ module Kernel
 
   def match(*vals, &block)
     do_match = Proc.new do |val|
-      env = PatternMatch::Env.new(self, val)
+      env = PatternMatch.const_get(:Env).new(self, val)
       class << env
         using ::PatternMatch::NameSpace
 
@@ -498,8 +530,10 @@ module Kernel
           obj.__send__(name, *args)
         end
       end
-      env.instance_eval(&block)
-      env.ret
+      catch(:exit_match) do
+        env.instance_eval(&block)
+        raise ::PatternMatch::NoMatchingPatternError
+      end
     end
     case vals.length
     when 0

data/lib/pattern-match/version.rb

@@ -1,3 +1,3 @@
 module PatternMatch
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/test_pattern-match.rb

@@ -6,6 +6,7 @@ class TestPatternMatch < Test::Unit::TestCase
     this = self
     ret = match([0, 1, 2, 3]) {
       with(nil) { flunk }
+      with(_[a, 0, 0, b]) { flunk }
       with(_[a, Fixnum , 2, b]) {
         assert_equal(this, self)
         assert_equal(0, a)
@@ -18,11 +19,12 @@ class TestPatternMatch < Test::Unit::TestCase
     assert_raise(NameError) { a }
     assert_raise(NameError) { b }
 
-    ret = match(0) {
-      with(1) { flunk }
-      with(2) { flunk }
+    assert_raise(PatternMatch::NoMatchingPatternError) {
+      match(0) {
+        with(1) { flunk }
+        with(2) { flunk }
+      }
     }
-    assert_nil(ret)
 
     match(0) {
       with(i, guard { i.odd? }) { flunk }
@@ -95,6 +97,18 @@ class TestPatternMatch < Test::Unit::TestCase
     end
   end
 
+  def test_override_singleton_method
+    skip 'Module#prepend not supported' unless Module.private_method_defined?(:prepend)
+    match(0) {
+      with(_test_override_singleton_method) {
+        def self._test_override_singleton_method
+          1
+        end
+        assert_equal(0, _test_override_singleton_method)
+      }
+    }
+  end
+
   def test_uscore
     match([0, 1, Fixnum]) {
       with(_[_, ! _(Float), _(Fixnum, :==)]) {
@@ -295,7 +309,7 @@ class TestPatternMatch < Test::Unit::TestCase
   end
 
   def test_match_without_argument
-    assert_equal(1, 2.times.find(&match { with(1) { true } }))
+    assert_equal(1, 2.times.find(&match { with(1) { true }; with(_) { false } }))
   end
 
   def test_extractor_class
@@ -453,6 +467,24 @@ class TestPatternMatch < Test::Unit::TestCase
     }
   end
 
+  def test_hash
+    match({a: 0, b: 1}) {
+      with(Hash.(a: a, b: b, c: c)) { flunk }
+      with(Hash.(a: a, b: b)) {
+        assert_equal(0, a)
+        assert_equal(1, b)
+      }
+      with(_) { flunk }
+    }
+
+    match({a: 0, b: 1}) {
+      with(Hash.(a: a)) {
+        assert_equal(0, a)
+      }
+      with(_) { flunk }
+    }
+  end
+
   def test_refine_after_requiring_library
     c = Class.new
     ::PatternMatch::NameSpace.module_eval {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pattern-match
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-17 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8625920 !ruby/object:Gem::Requirement
+  requirement: &8646440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8625920
+  version_requirements: *8646440
 description: A pattern matching library.
 email:
 - kazuki@callcc.net
@@ -57,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900071050850383955
+      hash: 1580258758057961953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -900071050850383955
+      hash: 1580258758057961953
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11