sexp_processor 4.14.1 → 4.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59db6864bb21ae55d428724e2b8b99a3098c00309a8ccdfb8e8cc05dabb82021
-  data.tar.gz: 80a9a79d9ef68f29d1f9ee0ba5ba0259557b86aaa693fd0f06f70e7524c195b0
+  metadata.gz: 13decb62dc5a9e3ad356a489225d2aa3f36dab3ef63e29db89edda32ac60a04d
+  data.tar.gz: 39e9ff2e73bd2f69cdd5c1e7cd98d3da3e7c03c40657092533c8b82279031617
 SHA512:
-  metadata.gz: b9a2677646cf9d7725d7ad05bb6270c0261668367e705dd22e898adb5021999ebf152e8a5d72bab167f1db3705e9b5dbb4e6d07d3bb0597382c0134626c00894
-  data.tar.gz: c074793315c71fddfa9063eb28475fd205ef479c5049be668e47be4605144a7a0be36b421eb8e432f8a5f34e45089d61be947ee05ce0e352e11af7c213ae299c
+  metadata.gz: 2ca2ac2f02fd90558435f7631f0f995c6cdea2ed8ac7d0b28508e3df3f252613e75dcd194dc97a71c76391cd961251f8ad55a58ab78278caf18df31ed058d3a5
+  data.tar.gz: 5351c69b957632396798faae6f7d86eeb2cddbe499b017d3e44bb24e7feda951052d0d94031615b6a0bbee5de522ada528a75bb62ac4d43d40b2929304b76b94

data/History.rdoc

@@ -1,3 +1,15 @@
+=== 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:

data/Rakefile

@@ -11,7 +11,7 @@ Hoe.add_include_dirs("../../ruby_parser/dev/lib")
 Hoe.spec 'sexp_processor' do
   developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
 
-  require_ruby_version "~> 2.2"
+  require_ruby_version [">= 2.1", "< 3.1"]
 
   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

@@ -455,7 +455,7 @@ class Sexp #:nodoc:
       #        | NAME:name                   => name.to_sym
       # UP_NAME: /[A-Z]\w*/
       #   NAME : /:?[\w?!=~-]+/
-      #    CMD : "t" | "k" | "m" | "atom" | "not?" | "-" | "any"
+      #    CMD : t | k | m | atom | not? | - | any | child | include
 
       def parse_sexp
         token = next_token
@@ -505,7 +505,7 @@ class Sexp #:nodoc:
       ##
       # A collection of allowed commands to convert into matchers.
 
-      ALLOWED = [:t, :m, :k, :atom, :not?, :-, :any].freeze
+      ALLOWED = [:t, :m, :k, :atom, :not?, :-, :any, :child, :include].freeze
 
       ##
       # Parses a balanced command. A command is denoted by square
@@ -760,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:

data/lib/sexp_processor.rb

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

data/test/test_sexp.rb

@@ -906,7 +906,7 @@ class TestChild < MatcherTestCase
   end
 
   def sexp
-    s(:x, s(:a))
+    s(:x, s(:b), s(:a))
   end
 
   def bad_sexp
@@ -926,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
 
@@ -1602,6 +1604,7 @@ class TestSexpMatcherParser < Minitest::Test
   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)"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sexp_processor
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.15.1
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   m5x9IDiApM+vCELNwDXXGNFEnQBBK+wAe4Pek8o1V1TTOxL1kGPewVOitX1p3xoN
   h7iEjga8iM1LbZUfiISZ+WrB
   -----END CERTIFICATE-----
-date: 2020-02-09 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -106,16 +106,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '2.1'
+  - - "<"
     - !ruby/object:Gem::Version
-      version: '2.2'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: sexp_processor branches from ParseTree bringing all the generic sexp processing