pattern-match 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7472cd3f781f3de13a150b3f7451f1b6c7acbebc
-  data.tar.gz: a400bedeed0e8e87ec9a0c56e283184083f34988
+SHA256:
+  metadata.gz: 2cd3ccf69d626d2302494e2393796dfb571b06aace34f29def21dde39021e852
+  data.tar.gz: 8cfb00569ac023f7e76d1ae165a4f0ca2c43fa3afb82eb1e17dce30012d8ca4a
 SHA512:
-  metadata.gz: c94fa67c645a45c2e67d3c02a2e86e0612a61749ccbc9098469d784e5afa65891d9dc88311f3ae4b73a27c1fa252d0db31789ad4739f96840100a3633a95f98d
-  data.tar.gz: 3822c0b6c0d94237c589e1f15aa93818c399ffb677bdfce95c6e8ae5082ddd4fb51e5d00b35222e044b2bd9b3041319bbae5ad10f085d36bcf61e09e553932e9
+  metadata.gz: 575702a7996ba07a2a0b8bf3cbc5fd83035298f9ecec13fffb51652b8b6f92742df823d59bcfdd53cba8ebcb8e7861876215ea413573416c2aa167987b4257f2
+  data.tar.gz: 40218d0fbd2c075b6b2a0660febd458d04d5e379b0fdc06ca6c7588207091297fb2952eb7a2683ba686e154777a9fd6baf005feda34b8d2e303544764699f92f

data/.github/workflows/ci.yml

@@ -0,0 +1,35 @@
+on: [ push, pull_request ]
+
+jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.4
+  test:
+    needs: ruby-versions
+    name: >-
+      Test (${{ matrix.ruby-version }} / ${{ matrix.os }} / DISABLE_REFINEMENTS: ${{ matrix.DISABLE_REFINEMENTS }})
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        os: [ ubuntu-latest, macos-latest ]
+        exclude:
+          - { os: macos-latest, ruby-version: 2.4 }
+          - { os: macos-latest, ruby-version: 2.5 }
+        DISABLE_REFINEMENTS: [ 1, 0 ]
+    runs-on: ${{ matrix.os }}
+    env:
+      DISABLE_REFINEMENTS: ${{ matrix.DISABLE_REFINEMENTS }}
+    continue-on-error: ${{ matrix.ruby-version == 'head' }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Run the test suite
+        run: |
+          bundle exec rake

data/BSDL

@@ -1,4 +1,4 @@
-Copyright (C) 2012-2015 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2012 Kazuki Tsujimoto
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (C) 2012-2015 Kazuki Tsujimoto, All rights reserved.
+Copyright (C) 2012 Kazuki Tsujimoto
 
 You can redistribute it and/or modify it under either the terms of the
 2-clause BSDL (see the file BSDL), or the conditions below:

data/README.rdoc

@@ -48,14 +48,14 @@ An ordinary object is a value pattern.
 The pattern matches an object such that <code>pattern === object</code>.
 
  match(0) do
-   with(Fixnum) { :match } #=> :match
+   with(Integer) { :match } #=> :match
  end
 
 If you want to use an another method of matching,
 you have to use <code>_</code> as follows.
 
  match(0) do
-   with(_(Fixnum, :==)) { :match }
+   with(_(Integer, :==)) { :match }
  end #=> NoMatchingPatternError
 
 === Deconstructor
@@ -112,7 +112,7 @@ all objects bound to variable must be equal.
 <code>And</code>, <code>Or</code>, <code>Not</code> return and/or/not pattern.
 
  match([0, [1]]) do
-   with(_[a & Fixnum, ! (_[2] | _[3])]) { a } #=> 0
+   with(_[a & Integer, ! (_[2] | _[3])]) { a } #=> 0
  end
 
  match(0) do
@@ -129,7 +129,7 @@ They are equivalent to <code>*</code>, <code>*?</code>,
 You can write as <code>*pattern</code> instead of <code>pattern, \___</code>.
 
  match([:a, 0, :b, :c]) do
-   with(_[a & Symbol, ___, b & Fixnum, c & Symbol, ___]) do
+   with(_[a & Symbol, ___, b & Integer, c & Symbol, ___]) do
      a #=> [:a]
      b #=> 0
      c #=> [:b, :c]
@@ -142,7 +142,7 @@ You can write as <code>*pattern</code> instead of <code>pattern, \___</code>.
 It is equivalent to <code>()</code> in regular expression.
 
  match([:a, 0, :b, 1]) do
-   with(_[Seq(a & Symbol, b & Fixnum), ___]) do
+   with(_[Seq(a & Symbol, b & Integer), ___]) do
      a #=> [:a, :b]
      b #=> [0, 1]
    end
@@ -154,6 +154,7 @@ It is equivalent to <code>()</code> in regular expression.
   * KeyMatcher
     * Hash.()
   * AttributeMatcher
+* fallthrough (requires binding_of_caller gem)
 
 To use experimental features, you must also require 'pattern-match/experimental'.
 See source code for more details.
@@ -251,8 +252,19 @@ Pattern guard can be specified as a second argument to <code>with</code>.
    end
  end
 
-* {RubyTextProcessing}[https://code.google.com/p/tokland/wiki/RubyTextProcessing]
+ match([]) do
+   with(_[]) do
+     opts = {}
+     fallthrough
+   end
+   with(_[opts & Hash]) do
+     opts #=> {}
+   end
+ end
+
+* {tokland/RubyTextProcessing}[https://github.com/tokland/tokland/wiki/RubyTextProcessing]
 * {yhara/tapl-ruby}[https://github.com/yhara/tapl-ruby]
+* {k-tsj/power_assert}[https://github.com/k-tsj/power_assert/blob/8e9e0399a032936e3e3f3c1f06e0d038565f8044/lib/power_assert.rb]
 
 == Reference
 * {Pattern Matching in Ruby (at Sapporo RubyKaigi 2012) // Speaker Deck}[https://speakerdeck.com/k_tsj/patternmatchinginruby]
@@ -264,5 +276,3 @@ Pattern guard can be specified as a second argument to <code>with</code>.
  $ bundle install --path vendor/bundle
  $ bundle exec rake test (or "bundle exec rake")
  $ bundle exec rake build
-
-== Travis Build Status {<img src="https://secure.travis-ci.org/k-tsj/pattern-match.png"/>}[http://travis-ci.org/k-tsj/pattern-match]

data/lib/pattern-match/core.rb

@@ -473,10 +473,17 @@ module PatternMatch
     end
   end
 
+  FALLTHROUGH_TAG = Object.new
+
   class Env < BasicObject
     def initialize(ctx, val)
       @ctx = ctx
       @val = val
+      @fallthrough_quasibinding = nil
+    end
+
+    def fallthrough_called?
+      !! @fallthrough_quasibinding
     end
 
     private
@@ -489,9 +496,22 @@ module PatternMatch
         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)
+      if fallthrough_called?
+        ret = with_quasibinding(ctx, pat.quasibinding.merge(@fallthrough_quasibinding), &block)
         ::Kernel.throw(self, ret)
+      end
+      if pat.match([@val])
+        ret = nil
+        fallthrough_called = true
+        block_quasibinding = ::Kernel.catch(::PatternMatch::FALLTHROUGH_TAG) do
+          ret = with_quasibinding(ctx, pat.quasibinding, &block)
+          fallthrough_called = false
+        end
+        if fallthrough_called
+          @fallthrough_quasibinding = pat.quasibinding.merge(block_quasibinding)
+        else
+          ::Kernel.throw(self, ret)
+        end
       else
         nil
       end
@@ -638,6 +658,9 @@ module PatternMatch
         env = Env.new(self, val)
         catch(env) do
           env.instance_eval(&block)
+          if env.fallthrough_called?
+            raise PatternMatchError, 'cannot fallthrough final case in match'
+          end
           raise NoMatchingPatternError
         end
       end

data/lib/pattern-match/deconstructor.rb

@@ -20,7 +20,11 @@ module PatternMatch
   end
 
   refine Class do
-    include PatternMatch::Deconstructable
+    if respond_to?(:import_methods, true)
+      import_methods PatternMatch::Deconstructable
+    else
+      include PatternMatch::Deconstructable
+    end
 
     def deconstruct(val)
       raise NotImplementedError, "need to define `#{__method__}'"
@@ -69,7 +73,11 @@ module PatternMatch
   end
 
   refine Regexp do
-    include PatternMatch::Deconstructable
+    if respond_to?(:import_methods, true)
+      import_methods PatternMatch::Deconstructable
+    else
+      include PatternMatch::Deconstructable
+    end
 
     def deconstruct(val)
       m = Regexp.new("\\A#{source}\\z", options).match(val.to_s)

data/lib/pattern-match/experimental.rb

@@ -62,6 +62,12 @@ module PatternMatch
     end
   end
 
+  refine Class do
+    if respond_to?(:import_methods, true)
+      import_methods PatternMatch::Deconstructable
+    end
+  end
+
   module AttributeMatcher
     def self.included(klass)
       class << klass
@@ -185,4 +191,18 @@ class Object
       Kernel.eval("with(#{pattern}) { self }", Kernel.binding)
     end
   end
+
+  begin
+    require 'binding_of_caller'
+
+    private
+
+    def fallthrough
+      b = binding.of_caller(1)
+      vars = b.eval('local_variables')
+      quasibinding = Hash[*vars.map {|i| [i, b.local_variable_get(i)] }.flatten(1)]
+      throw PatternMatch::FALLTHROUGH_TAG, quasibinding
+    end
+  rescue LoadError
+  end
 end

data/lib/pattern-match/version.rb

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

data/lib/pattern-match.rb

@@ -1,6 +1,6 @@
 # pattern-match.rb
 #
-# Copyright (C) 2012-2015 Kazuki Tsujimoto, All rights reserved.
+# Copyright (C) 2012 Kazuki Tsujimoto
 
 require 'pattern-match/version'
 require 'pattern-match/deconstructor'

data/pattern-match.gemspec

@@ -22,5 +22,4 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'test-unit'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'simplecov'
 end

data/test/test_experimental.rb

@@ -1,11 +1,11 @@
 require_relative 'helper'
 require 'test-unit'
-if ENV['DISABLE_REFINEMENTS']
-  require 'pattern-match/disable_refinements'
+if ENV['DISABLE_REFINEMENTS'].to_i.zero?
   require 'pattern-match'
+  using PatternMatch
 else
+  require 'pattern-match/disable_refinements'
   require 'pattern-match'
-  using PatternMatch
 end
 begin
   require 'pattern-match/experimental'
@@ -102,10 +102,10 @@ class TestExperimental < Test::Unit::TestCase
   end
 
   def test_object_assert_pattern
-    assert_equal([0], [0].assert_pattern('_[Fixnum]'))
-    assert_equal([0], [0].assert_pattern('_[a & Fixnum], guard { a.even? }'))
+    assert_equal([0], [0].assert_pattern('_[Integer]'))
+    assert_equal([0], [0].assert_pattern('_[a & Integer], guard { a.even? }'))
     assert_raises(PatternMatch::NoMatchingPatternError) do
-      [0, 1].assert_pattern('_[Fixnum]')
+      [0, 1].assert_pattern('_[Integer]')
     end
   end
 
@@ -145,4 +145,28 @@ class TestExperimental < Test::Unit::TestCase
       with(_) { flunk }
     end
   end
+
+  def test_fallthrough
+    omit unless respond_to?(:fallthrough, true)
+
+    match(0) do
+      with(a) do
+        b = 1
+        assert_equal 0, a
+        assert_equal 1, b
+        fallthrough
+      end
+      with(_[a, c]) do
+        assert_equal 0, a
+        assert_equal 1, b
+        assert_nil c
+      end
+    end
+
+    assert_raises(PatternMatch::PatternMatchError) do
+      match(0) do
+        with(_) { fallthrough }
+      end
+    end
+  end
 end if defined? PatternMatch::AttributeMatcher

data/test/test_standard.rb

@@ -1,11 +1,11 @@
 require_relative 'helper'
 require 'test-unit'
-if ENV['DISABLE_REFINEMENTS']
-  require 'pattern-match/disable_refinements'
+if ENV['DISABLE_REFINEMENTS'].to_i.zero?
   require 'pattern-match'
+  using PatternMatch
 else
+  require 'pattern-match/disable_refinements'
   require 'pattern-match'
-  using PatternMatch
 end
 
 class TestStandard < Test::Unit::TestCase
@@ -17,7 +17,7 @@ class TestStandard < Test::Unit::TestCase
       with(nil) { flunk }
       with(_[]) { flunk }
       with(_[a, 0, 0, b]) { flunk }
-      with(_[a, Fixnum , 2, b]) do
+      with(_[a, Integer , 2, b]) do
         assert_equal(this, self)
         assert_equal(0, a)
         assert_equal(3, b)
@@ -125,8 +125,8 @@ class TestStandard < Test::Unit::TestCase
   end
 
   def test_uscore
-    match([0, 1, Fixnum]) do
-      with(_[_, ! _(Float), _(Fixnum, :==)]) do
+    match([0, 1, Integer]) do
+      with(_[_, ! _(Float), _(Integer, :==)]) do
         assert_raises(NameError) { _ }
       end
       with(_) { flunk }
@@ -277,7 +277,7 @@ class TestStandard < Test::Unit::TestCase
     end
 
     match([[0, 1, :a, 'A'], [2, :b, :c, 'B'], ['C'], 3]) do
-      with(_[_[a & Fixnum, ___, b & Symbol, ___, c], ___, d]) do
+      with(_[_[a & Integer, ___, b & Symbol, ___, c], ___, d]) do
         assert_equal([[0, 1], [2], []], a)
         assert_equal([[:a], [:b, :c], []], b)
         assert_equal(['A', 'B', 'C'], c)
@@ -287,7 +287,7 @@ class TestStandard < Test::Unit::TestCase
     end
 
     match([0, 1, 2, 4, 5]) do
-      with(_[*a, b & Fixnum, __2, *c], guard { b.all?(&:even?) }) do
+      with(_[*a, b & Integer, __2, *c], guard { b.all?(&:even?) }) do
         assert_equal([0, 1], a)
         assert_equal([2, 4], b)
         assert_equal([5], c)
@@ -345,7 +345,7 @@ class TestStandard < Test::Unit::TestCase
     end
 
     match([0, :a, 1, 2, :b, 3]) do
-      with(_[Seq(a & Fixnum, b & Symbol, c & Fixnum), ___]) do
+      with(_[Seq(a & Integer, b & Symbol, c & Integer), ___]) do
         assert_equal([0, 2], a)
         assert_equal([:a, :b], b)
         assert_equal([1, 3], c)
@@ -354,12 +354,12 @@ class TestStandard < Test::Unit::TestCase
     end
 
     match([0, :a, 1, 2, :b, :c]) do
-      with(_[Seq(a & Fixnum, b & Symbol, c & Fixnum), ___]) { flunk }
+      with(_[Seq(a & Integer, b & Symbol, c & Integer), ___]) { flunk }
       with(_) { pass }
     end
 
     match([0, 1, :a, 2, 3, :b, 4, 5]) do
-      with(_[a, Seq(b & Fixnum, c & Symbol, d & Fixnum), ___, e]) do
+      with(_[a, Seq(b & Integer, c & Symbol, d & Integer), ___, e]) do
         assert_equal(0, a)
         assert_equal([1, 3], b)
         assert_equal([:a, :b], c)
@@ -422,7 +422,7 @@ class TestStandard < Test::Unit::TestCase
 
     assert_raises(NotImplementedError) do
       match([0]) do
-        with(_[Seq(a & Fixnum, ___), ___]) {}
+        with(_[Seq(a & Integer, ___), ___]) {}
       end
     end
   end
@@ -632,16 +632,16 @@ class TestStandard < Test::Unit::TestCase
   end
 
   def test_refinements
-    if ENV['DISABLE_REFINEMENTS']
-      assert_kind_of(PatternMatch.const_get(:Pattern), eval_in_unrefined_scope('Class.()'))
-      assert_equal(0, eval_in_unrefined_scope('match(0) { with(_) { 0 } }'))
-    else
+    if ENV['DISABLE_REFINEMENTS'].to_i.zero?
       assert_raises(NoMethodError) do
         eval_in_unrefined_scope('Class.()')
       end
       assert_raises(NoMethodError) do
         eval_in_unrefined_scope('match(0) { with(_) { 0 } }')
       end
+    else
+      assert_kind_of(PatternMatch.const_get(:Pattern), eval_in_unrefined_scope('Class.()'))
+      assert_equal(0, 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.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Kazuki Tsujimoto
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A pattern matching library.
 email:
 - kazuki@callcc.net
@@ -60,8 +46,8 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - BSDL
 - COPYING
 - Gemfile
@@ -83,7 +69,7 @@ licenses:
 - 2-clause BSDL
 - Ruby's
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -100,9 +86,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: A pattern matching library
-test_files: []
+test_files:
+- test/helper.rb
+- test/test_experimental.rb
+- test/test_standard.rb

data/.travis.yml

@@ -1,26 +0,0 @@
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - ruby-head
-  - jruby-19mode
-env:
-  - TEST="test/test_*"
-  - TEST="test/test_standard.rb"
-  - DISABLE_REFINEMENTS=1 TEST="test/test_*"
-  - DISABLE_REFINEMENTS=1 TEST="test/test_standard.rb"
-matrix:
-  exclude:
-    - rvm: 1.9.3
-      env: TEST="test/test_*"
-    - rvm: 1.9.3
-      env: TEST="test/test_standard.rb"
-    - rvm: jruby-19mode
-      env: TEST="test/test_*"
-    - rvm: jruby-19mode
-      env: TEST="test/test_standard.rb"
-    - rvm: jruby-19mode
-      env: DISABLE_REFINEMENTS=1 TEST="test/test_*"
-  allow_failures:
-    - rvm: ruby-head