pattern-match 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef7bf869eb224fa684f0d76e818765b7c29bac7a
-  data.tar.gz: 8f0250bc045bc40226c470eeecc0d4cb19c9948e
+  metadata.gz: 7472cd3f781f3de13a150b3f7451f1b6c7acbebc
+  data.tar.gz: a400bedeed0e8e87ec9a0c56e283184083f34988
 SHA512:
-  metadata.gz: da3c2aee6e261dc82bac97d578629b2d92a4449e6eb10ccd8f321fbd99330f2b505cde23df1e10080e7f9d2549ce40a9ba2c20c6e680d0fc6abe2c701cea3596
-  data.tar.gz: 5c7108710be125a049fe4fde57a1292e6e820a87cb414ef6fe7db18ad6d339da2549659381ea018b17de6469adcf51cb90240fa532c8ea92b44d027f3065f847
+  metadata.gz: c94fa67c645a45c2e67d3c02a2e86e0612a61749ccbc9098469d784e5afa65891d9dc88311f3ae4b73a27c1fa252d0db31789ad4739f96840100a3633a95f98d
+  data.tar.gz: 3822c0b6c0d94237c589e1f15aa93818c399ffb677bdfce95c6e8ae5082ddd4fb51e5d00b35222e044b2bd9b3041319bbae5ad10f085d36bcf61e09e553932e9

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle
+Gemfile.local
 Gemfile.lock
 coverage
 pkg/*

data/.travis.yml

@@ -16,10 +16,6 @@ matrix:
       env: TEST="test/test_*"
     - rvm: 1.9.3
       env: TEST="test/test_standard.rb"
-    - rvm: 2.0.0
-      env: TEST="test/test_*"
-    - rvm: 2.0.0
-      env: TEST="test/test_standard.rb"
     - rvm: jruby-19mode
       env: TEST="test/test_*"
     - rvm: jruby-19mode

data/Gemfile

@@ -1,3 +1,9 @@
 source "http://rubygems.org"
 
 gemspec
+
+# https://github.com/redmine/redmine/blob/3.0.4/Gemfile#L101
+local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
+if File.exist?(local_gemfile)
+  eval_gemfile local_gemfile
+end

data/LEGAL

@@ -0,0 +1,4 @@
+LEGAL NOTICE INFORMATION
+------------------------
+
+All the files in this distribution are written by the author.

data/lib/pattern-match/core.rb

@@ -1,5 +1,7 @@
 require 'pattern-match/deconstructor'
 
+using PatternMatch if respond_to?(:using, true)
+
 module PatternMatch
   module HasOrderedSubPatterns
     private
@@ -16,6 +18,9 @@ module PatternMatch
   class Pattern
     attr_accessor :parent, :next, :prev
 
+    attr_reader :subpatterns
+    private :subpatterns
+
     def initialize(*subpatterns)
       @parent = nil
       @next = nil
@@ -25,7 +30,7 @@ module PatternMatch
     end
 
     def vars
-      subpatterns.map(&:vars).flatten
+      subpatterns.flat_map(&:vars)
     end
 
     def ancestors
@@ -117,8 +122,6 @@ module PatternMatch
 
     private
 
-    attr_reader :subpatterns
-
     def repeating_match(vals, is_greedy)
       quantifier = @next
       candidates = generate_candidates(vals)
@@ -200,8 +203,6 @@ module PatternMatch
   class PatternObjectDeconstructor < PatternDeconstructor
     include HasOrderedSubPatterns
 
-    using PatternMatch if respond_to?(:using, true)
-
     def initialize(deconstructor, *subpatterns)
       super(*subpatterns)
       @deconstructor = deconstructor
@@ -483,14 +484,14 @@ module PatternMatch
     def with(pat_or_val, guard_proc = nil, &block)
       ctx = @ctx
       pat = pat_or_val.kind_of?(Pattern) ? pat_or_val : PatternValue.new(pat_or_val)
-      pat.append(PatternCondition.new { check_for_duplicate_vars(pat.vars) })
+      pat.append(PatternCondition.new { validate_uniqueness_of_dup_vars(pat.vars) })
       if guard_proc
         pat.append(PatternCondition.new { with_quasibinding(ctx, pat.quasibinding, &guard_proc) })
       end
       pat.validate
       if pat.match([@val])
         ret = with_quasibinding(ctx, pat.quasibinding, &block)
-        ::Kernel.throw(:exit_match, ret)
+        ::Kernel.throw(self, ret)
       else
         nil
       end
@@ -524,8 +525,6 @@ module PatternMatch
       when 0
         uscore = PatternVariable.new(:_)
         class << uscore
-          using PatternMatch if respond_to?(:using, true)
-
           def [](*args)
             Array.(*args)
           end
@@ -568,17 +567,8 @@ module PatternMatch
       PatternNot.new(*subpatterns)
     end
 
-    def check_for_duplicate_vars(vars)
-      vars.each_with_object({}) do |v, h|
-        if h.has_key?(v.name)
-          unless h[v.name] == v.val
-            return false
-          end
-        else
-          h[v.name] = v.val
-        end
-      end
-      true
+    def validate_uniqueness_of_dup_vars(vars)
+      vars.group_by(&:name).all? {|_, dup_vars| dup_vars.map(&:val).uniq.length == 1 }
     end
 
     class QuasiBindingModule < ::Module
@@ -630,26 +620,23 @@ module PatternMatch
   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 <= Pattern
-        private_constant c
-      end
+  # Make Pattern and its subclasses, etc private.
+  constants.each do |c|
+    klass = const_get(c)
+    next unless klass.kind_of?(Class)
+    if klass <= Pattern
+      private_constant c
     end
-    private_constant :Env
   end
+  private_constant :Env, :HasOrderedSubPatterns
 
   refine Object do
-
     private
 
     def match(*vals, &block)
       do_match = Proc.new do |val|
         env = Env.new(self, val)
-        catch(:exit_match) do
+        catch(env) do
           env.instance_eval(&block)
           raise NoMatchingPatternError
         end

data/lib/pattern-match/deconstructor.rb

@@ -8,10 +8,12 @@ module PatternMatch
       PatternObjectDeconstructor.new(self, *subpatterns)
     end
   end
+end
 
-  module Deconstructable
-    using PatternMatch if respond_to?(:using, true)
+using PatternMatch if respond_to?(:using, true)
 
+module PatternMatch
+  module Deconstructable
     def call(*subpatterns)
       pattern_matcher(*subpatterns)
     end

data/lib/pattern-match/disable_refinements.rb

@@ -1,10 +1,12 @@
 class Module
-  methods = Module.instance_methods(false) + Module.private_instance_methods(false)
+  refine_orig = "__refine_orig_#{Time.now.to_i}".to_sym
+
+  methods = instance_methods(false) + private_instance_methods(false)
   if methods.include?(:refine)
-    if methods.include?(:__refine_orig)
+    if methods.include?(refine_orig)
       raise LoadError, "can't re-define Module#refine"
     end
-    alias_method :__refine_orig, :refine
+    alias_method refine_orig, :refine
     remove_method :refine
   end
 
@@ -17,9 +19,9 @@ class Module
   ensure
     remove_method :refine
 
-    if Kernel.respond_to?(:__refine_orig, true)
-      alias_method :refine, :__refine_orig
-      remove_method :__refine_orig
+    if Kernel.respond_to?(refine_orig, true)
+      alias_method :refine, refine_orig
+      remove_method refine_orig
     end
   end
 end

data/lib/pattern-match/experimental.rb

@@ -4,6 +4,8 @@ require 'set'
 
 raise LoadError, 'Module#prepend required' unless Module.respond_to?(:prepend, true)
 
+using PatternMatch if respond_to?(:using, true)
+
 module PatternMatch
   class Pattern
     module Backtrackable
@@ -50,8 +52,6 @@ module PatternMatch
   end
 
   module Deconstructable
-    using PatternMatch if respond_to?(:using, true)
-
     remove_method :call
     def call(*subpatterns)
       if Object == self
@@ -180,8 +180,6 @@ class Hash
 end
 
 class Object
-  using PatternMatch if respond_to?(:using, true)
-
   def assert_pattern(pattern)
     match(self) do
       Kernel.eval("with(#{pattern}) { self }", Kernel.binding)

data/lib/pattern-match/version.rb

@@ -1,3 +1,3 @@
 module PatternMatch
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/pattern-match.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables      = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f) }
   s.require_paths    = ['lib']
-  s.add_development_dependency 'test-unit'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
   s.extra_rdoc_files = ['README.rdoc']
   s.rdoc_options     = ['--main', 'README.rdoc']
   s.licenses         = ['2-clause BSDL', "Ruby's"]
+
+  s.add_development_dependency 'test-unit'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'simplecov'
 end

data/test/helper.rb

@@ -6,6 +6,12 @@ module Test::Unit::Assertions
   end
 end
 
+module TestUtils
+  def eval_in_unrefined_scope(expr)
+    eval(expr)
+  end
+end
+
 begin
   if ENV['COVERAGE']
     require 'simplecov'

data/test/test_experimental.rb

@@ -1,14 +1,14 @@
 require_relative 'helper'
 require 'test-unit'
 if ENV['DISABLE_REFINEMENTS']
-  require_relative '../lib/pattern-match/disable_refinements'
-  require_relative '../lib/pattern-match'
+  require 'pattern-match/disable_refinements'
+  require 'pattern-match'
 else
-  require_relative '../lib/pattern-match'
+  require 'pattern-match'
   using PatternMatch
 end
 begin
-  require_relative '../lib/pattern-match/experimental'
+  require 'pattern-match/experimental'
 rescue LoadError
 end
 

data/test/test_standard.rb

@@ -1,14 +1,16 @@
 require_relative 'helper'
 require 'test-unit'
 if ENV['DISABLE_REFINEMENTS']
-  require_relative '../lib/pattern-match/disable_refinements'
-  require_relative '../lib/pattern-match'
+  require 'pattern-match/disable_refinements'
+  require 'pattern-match'
 else
-  require_relative '../lib/pattern-match'
+  require 'pattern-match'
   using PatternMatch
 end
 
 class TestStandard < Test::Unit::TestCase
+  include TestUtils
+
   def test_basic
     this = self
     ret = match([0, 1, 2, 3]) do
@@ -631,14 +633,14 @@ class TestStandard < Test::Unit::TestCase
 
   def test_refinements
     if ENV['DISABLE_REFINEMENTS']
-      assert_kind_of(PatternMatch.const_get(:Pattern), eval('Class.()', TOPLEVEL_BINDING))
-      assert_equal(0, eval('match(0) { with(_) { 0 } }', TOPLEVEL_BINDING))
+      assert_kind_of(PatternMatch.const_get(:Pattern), eval_in_unrefined_scope('Class.()'))
+      assert_equal(0, eval_in_unrefined_scope('match(0) { with(_) { 0 } }'))
     else
       assert_raises(NoMethodError) do
-        eval('Class.()', TOPLEVEL_BINDING)
+        eval_in_unrefined_scope('Class.()')
       end
       assert_raises(NoMethodError) do
-        eval('match(0) { with(_) { 0 } }', TOPLEVEL_BINDING)
+        eval_in_unrefined_scope('match(0) { with(_) { 0 } }')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pattern-match
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kazuki Tsujimoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -65,6 +65,7 @@ files:
 - BSDL
 - COPYING
 - Gemfile
+- LEGAL
 - README.rdoc
 - Rakefile
 - lib/pattern-match.rb
@@ -100,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A pattern matching library