sexp_processor 4.14.1 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59db6864bb21ae55d428724e2b8b99a3098c00309a8ccdfb8e8cc05dabb82021
-  data.tar.gz: 80a9a79d9ef68f29d1f9ee0ba5ba0259557b86aaa693fd0f06f70e7524c195b0
+  metadata.gz: dae436d9eece3ad19a5d390da622ee2b73db2db5e73a4a6b06fe351e8759d45f
+  data.tar.gz: 64c4cda4d2f25f759812de2dea4bd7d85e948a6d9cba8507a7d64318c358d116
 SHA512:
-  metadata.gz: b9a2677646cf9d7725d7ad05bb6270c0261668367e705dd22e898adb5021999ebf152e8a5d72bab167f1db3705e9b5dbb4e6d07d3bb0597382c0134626c00894
-  data.tar.gz: c074793315c71fddfa9063eb28475fd205ef479c5049be668e47be4605144a7a0be36b421eb8e432f8a5f34e45089d61be947ee05ce0e352e11af7c213ae299c
+  metadata.gz: 8647ce87dca77073d067bd2027b139499fa8db297ea524c453d709f5e52f057c9355b8b2f49e265aa09aef7c1a29dc6038409fb5ba19d33c9fb2eeb972b4c210
+  data.tar.gz: 38eb466cf27e2eeb30a14c9eabae202ab3b1d7f119b7b2a715c848fdcf98b8e2e130d656e05336781572d7ca9ff74ea8185683e065e6af557cac50f483b92436

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 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/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.0"
 
   ##
   # 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.0
 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-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc