sexp_processor 4.13.0 → 4.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3991f250f861371d86496a6791f7489bd15e8815d32abde04d8b204fffc63ce1
-  data.tar.gz: aa0676a04c31383e91aa7227e339ccb484cff4476a862ed9ecaabd10e4b31337
+  metadata.gz: 2a1ff30b6d0fb789e333a721668f6a71d0ea050847ee74dd202053617779d78d
+  data.tar.gz: 025f98b49497f076193e118d887914034ed174f165f8388a6114e464da7e9f4a
 SHA512:
-  metadata.gz: c2a3ada3f252f86ce039e3ee5d21159a116733c22ec3bd09155fa403c36c3155148296982ebacb7c3312d982bff94c19ef24b24fd1f2aa0e31fc0619871c1d6c
-  data.tar.gz: 4aaccec314475c895a4632588094684ae48459892d9124645219559c9cad58c4a4dfb2fe32dde8877ebd4927ec0b4fe2664dc2a9bf4e5799cbabecc0bbca9c51
+  metadata.gz: 4ce0cf0eb8144e47edc0e4b7550d2e14c81e5d2745fa3d19203e8c6737ff61f58314b087bc2d07cfe087037e0f8138895240a585196328f0a7279a16fc0c5a46
+  data.tar.gz: 1d1ba8b291bd55ad533ad45ee7d7a6d894e6f3b2354b58d0d5663bb683fea37b8c21abc75386ed4f01f5df8ff92040415b8557172d7680ee9d2f0dc8e4f789eb

data/History.rdoc

@@ -1,3 +1,37 @@
+=== 4.15.2 / 2021-01-10
+
+* 1 bug fix:
+
+  * Bumped ruby version to include < 4 (trunk).
+
+=== 4.15.1 / 2020-08-31
+
+* 1 bug fix:
+
+  * Bumped ruby version to include 3.0 (trunk).
+
+=== 4.15.0 / 2020-06-09
+
+* 1 minor enhancement:
+
+  * Added `child` and `include` to Sexp::Matcher.parse language.
+
+=== 4.14.1 / 2020-02-09
+
+* 2 bug fixes:
+
+  * Declared support for ruby 2.2+ to gemspec.
+  * Fixed alias for `not?` to `-` for ruby <= 2.4. (nard-tech).
+
+=== 4.14.0 / 2020-02-06
+
+* 4 minor enhancements:
+
+  * Added '-' as an alias for the 'not?' pattern matching command.
+  * Added Klass matcher to match on types.
+  * Added `k` shortcut for Klass & hooked into Sexp::Matcher.parse.
+  * Added any matcher to pattern parser.
+
 === 4.13.0 / 2019-09-24
 
 * 4 minor enhancements:

data/Rakefile

@@ -11,6 +11,8 @@ Hoe.add_include_dirs("../../ruby_parser/dev/lib")
 Hoe.spec 'sexp_processor' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
+  require_ruby_version [">= 2.1", "< 4"]
+
   license "MIT"
 end
 

data/lib/pt_testcase.rb

@@ -77,7 +77,7 @@ class ParseTreeTestCase < Minitest::Test
   end
 
   def self.add_19tests name, hash
-    add_tests "#{name}__19_20_21_22_23_24_25_26", hash # HACK?
+    add_tests "#{name}__19_20_21_22_23_24_25_26_27", hash # HACK?
   end
 
   def self.add_19edgecases ruby, sexp, cases
@@ -102,7 +102,7 @@ class ParseTreeTestCase < Minitest::Test
     testcases[verbose][klass] = testcases[nonverbose][klass]
   end
 
-  VER_RE = "(1[89]|2[0123456])"
+  VER_RE = "(1[89]|2[01234567])"
 
   def self.generate_test klass, node, data, input_name, output_name
     klass.send :define_method, "test_#{node}" do

data/lib/sexp_matcher.rb

@@ -156,6 +156,10 @@ class Sexp #:nodoc:
     Not.new arg
   end
 
+  class << self
+    alias - not?
+  end
+
   # TODO: add Sibling factory method?
 
   ##
@@ -196,6 +200,15 @@ class Sexp #:nodoc:
     Pattern.new Regexp.union(*res)
   end
 
+  ##
+  # Matches an atom of the specified +klass+ (or module).
+  #
+  # See Pattern for examples.
+
+  def self.k klass
+    Klass.new klass
+  end
+
   ##
   # Defines a family of objects that can be used to match sexps to
   # certain types of patterns, much like regexps can be used on
@@ -438,9 +451,11 @@ class Sexp #:nodoc:
       #        | "_"                         => Sexp._
       #        | /^\/(.*)\/$/:re             => Regexp.new re[0]
       #        | /^"(.*)"$/:s                => String.new s[0]
+      #        | UP_NAME:name                => Object.const_get name
       #        | NAME:name                   => name.to_sym
+      # UP_NAME: /[A-Z]\w*/
       #   NAME : /:?[\w?!=~-]+/
-      #    CMD : "t" | "m" | "atom" | "not?"
+      #    CMD : t | k | m | atom | not? | - | any | child | include
 
       def parse_sexp
         token = next_token
@@ -465,6 +480,8 @@ class Sexp #:nodoc:
           Regexp.new re
         when /^"(.*)"$/ then
           $1
+        when /^([A-Z]\w*)$/ then
+          Object.const_get $1
         when /^:?([\w?!=~-]+)$/ then
           $1.to_sym
         else
@@ -488,7 +505,7 @@ class Sexp #:nodoc:
       ##
       # A collection of allowed commands to convert into matchers.
 
-      ALLOWED = [:t, :m, :atom, :not?].freeze
+      ALLOWED = [:t, :m, :k, :atom, :not?, :-, :any, :child, :include].freeze
 
       ##
       # Parses a balanced command. A command is denoted by square
@@ -743,11 +760,8 @@ class Sexp #:nodoc:
     # +child+.
 
     def satisfy? o
-      if child.satisfy? o
-        true
-      elsif o.kind_of? Sexp
-        o.search_each(child).any?
-      end
+      child.satisfy?(o) ||
+        (o.kind_of?(Sexp) && o.search_each(child).any?)
     end
 
     def == o # :nodoc:
@@ -847,6 +861,29 @@ class Sexp #:nodoc:
     end
   end
 
+  ##
+  # Matches any atom that is an instance of the specified class or module.
+  #
+  # examples:
+  #
+  #   s(:lit, 6.28) / s{ q(:lit, k(Float)) }                   #=> [s(:lit, 6.28)]
+
+  class Klass < Pattern
+    def satisfy? o
+      o.kind_of? self.pattern
+    end
+
+    def inspect # :nodoc:
+      "k(%p)" % pattern
+    end
+
+    def pretty_print q # :nodoc:
+      q.group 1, "k(", ")" do
+        q.pp pattern
+      end
+    end
+  end
+
   ##
   # Matches anything having the same sexp_type, which is the first
   # value in a Sexp.

data/lib/sexp_processor.rb

@@ -34,7 +34,7 @@ require "sexp"
 class SexpProcessor
 
   # duh
-  VERSION = "4.13.0"
+  VERSION = "4.15.2"
 
   ##
   # Automatically shifts off the Sexp type before handing the

data/test/test_sexp.rb

@@ -529,8 +529,6 @@ class TestSexp < SexpTestCase # ZenTest FULL
   def test_shift
     skip_if_strict 5
 
-    skip "https://github.com/MagLev/maglev/issues/250" if maglev?
-
     assert_equal(1, @sexp.shift)
     assert_equal(2, @sexp.shift)
     assert_equal(3, @sexp.shift)
@@ -722,11 +720,17 @@ class TestSexpMatcher < SexpTestCase
   end
 
   def test_cls_m
-    assert_equal M::Pattern.new(/a/), s{ m(/a/) }
-    assert_equal M::Pattern.new(/\Aa\Z/), s{ m(:a) }
-    assert_equal M::Pattern.new(/test_\w/), s{ m(/test_\w/) }
     re = Regexp.union [/\w/, /\d/]
-    assert_equal M::Pattern.new(re), s{ m(/\w/,/\d/) }
+
+    assert_equal M::Pattern.new(/a/),       s{ m(/a/)       }
+    assert_equal M::Pattern.new(/\Aa\Z/),   s{ m(:a)        }
+    assert_equal M::Pattern.new(/test_\w/), s{ m(/test_\w/) }
+    assert_equal M::Pattern.new(re),        s{ m(/\w/,/\d/) }
+  end
+
+  def test_cls_k
+    assert_equal M::Klass.new(Float),       s{ k(Float)     }
+    assert_operator M::Klass.new(Float), :===, 6.28
   end
 
   def test_amp
@@ -902,7 +906,7 @@ class TestChild < MatcherTestCase
   end
 
   def sexp
-    s(:x, s(:a))
+    s(:x, s(:b), s(:a))
   end
 
   def bad_sexp
@@ -922,6 +926,8 @@ class TestChild < MatcherTestCase
 
   def test_satisfy_eh_by_child
     assert_satisfy matcher, s(:a)
+    assert_satisfy matcher, sexp
+    refute_satisfy matcher, bad_sexp
   end
 end
 
@@ -1591,12 +1597,17 @@ class TestSexpMatcherParser < Minitest::Test
   test_parse "match_n",  delay{ m(re) },                      "[m a b c]"
   test_parse "ne",       delay{ q(:call, _, :!=, _) },        "(call _ != _)"
   test_parse "eq",       delay{ q(:call, _, :==, _) },        "(call _ == _)"
-  test_parse "not",      delay{ q(:call, _, :"!")   },        "(call _ !)"
+  test_parse "not_call", delay{ q(:call, _, :"!")   },        "(call _ !)"
   test_parse "eh",       delay{ q(:call, _, :include?, _) },  "(call _ include? _)"
   test_parse "under",    delay{ q(:call, nil, :_, _) },       "(call nil :_ _)"
   test_parse "sym_nil",  delay{ q(:call, nil, :nil, _) },     "(call nil :nil _)"
-  # M::Not.new(M.q(:a)), s{ not?(q(:a)) }
-  test_parse "not?",     delay{ not?(m(/^_$/)) }, "[not? [m /^_$/]]"
+  test_parse "not?",     delay{ not?(m(/^_$/)) },             "[not? [m /^_$/]]"
+  test_parse "not2",     delay{ -_ },                         "[- _]"
+  test_parse "any",      delay{ q(:a) | q(:b) },              "[any (a) (b)]"
+  test_parse "child",    delay{ child(q(:str, m(/woot/))) },  "[child (str [m /woot/])]"
+
+  test_parse "klass",    delay{ q(:lit, k(Float)) },          "(lit [k Float])"
+  test_parse "const",    delay{ q(:const, :Float) },          "(const :Float)"
 
   test_bad_parse "open_sexp",   "(a"
   test_bad_parse "closed_sexp", "a)"

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.13.0
+  version: 4.15.2
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBTANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIwMTIyMjIwMzgzMFoXDTIxMTIyMjIwMzgzMFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQAE3XRm1YZcCVjAJy5yMZvTOFrS7B2SYErc+0QwmKYbHztTTDY2m5Bii+jhpuxh
+  H+ETcU1z8TUKLpsBUP4kUpIRowkVN1p/jKapV8T3Rbwq+VuYFe+GMKsf8wGZSecG
+  oMQ8DzzauZfbvhe2kDg7G9BBPU0wLQlY25rDcCy9bLnD7R0UK3ONqpwvsI5I7x5X
+  ZIMXR0a9/DG+55mawwdGzCQobDKiSNLK89KK7OcNTALKU0DfgdTkktdgKchzKHqZ
+  d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
+  KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2019-09-25 00:00:00.000000000 Z
+date: 2021-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -57,14 +57,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.22'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.22'
 description: |-
   sexp_processor branches from ParseTree bringing all the generic sexp
   processing tools with it. Sexp, SexpProcessor, Environment, etc... all
@@ -96,8 +96,9 @@ files:
 homepage: https://github.com/seattlerb/sexp_processor
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/sexp_processor
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -107,15 +108,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: sexp_processor branches from ParseTree bringing all the generic sexp processing
   tools with it