sexp_processor 4.12.0 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a33c4da3c4f6c19506d4aee6f94e76dca65aa94a3af108f751bd916cfbd0cb8f
-  data.tar.gz: de4b25babc82dc51481153180ae65a5d9ab54079c3d2b77519666ff8b537f3fa
+  metadata.gz: dae436d9eece3ad19a5d390da622ee2b73db2db5e73a4a6b06fe351e8759d45f
+  data.tar.gz: 64c4cda4d2f25f759812de2dea4bd7d85e948a6d9cba8507a7d64318c358d116
 SHA512:
-  metadata.gz: 34e1e1f066956df4c8b71e96a2183c62183c02628ef7e7193f0c7bd48897960e4c7a47a9e08e8e9dcd02b7d202f6f2a6072511cf8d231932bb3e12de9799feef
-  data.tar.gz: 28d1ef553de797ccdb2f00fdd3b81b1c05d26dd7ce7b8e4fbb397e175fcb7d45d2647a684c1b3b6778f01df38ef6544e151ec3484f3349257ab7de3eb5f4a586
+  metadata.gz: 8647ce87dca77073d067bd2027b139499fa8db297ea524c453d709f5e52f057c9355b8b2f49e265aa09aef7c1a29dc6038409fb5ba19d33c9fb2eeb972b4c210
+  data.tar.gz: 38eb466cf27e2eeb30a14c9eabae202ab3b1d7f119b7b2a715c848fdcf98b8e2e130d656e05336781572d7ca9ff74ea8185683e065e6af557cac50f483b92436

data/History.rdoc

@@ -1,3 +1,50 @@
+=== 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:
+
+  * Added Sexp.q (query) and deprecated Sexp.s to distinguish better and match inspect output.
+  * Extended Sexp::Matcher::Parser to allow `not?` patterns.
+  * Extended Sexp::Matcher::Parser to cover more method names.
+  * Split out all pattern-oriented code to sexp_matcher.rb.
+
+* 1 bug fix:
+
+  * Fixed bug w/ ruby's Array#eql? and #hash not looking at ivars.
+
+=== 4.12.1 / 2019-06-03
+
+* 1 minor enhancement:
+
+  * Sexp#line now raises if setting w/ non-integer (eg nil).
+
+* 3 bug fixes:
+
+  * Fixed pt_testcase.rb for block args w/ trailing commas.
+  * Fixed pt_testcase.rb for stabby proc sexps.
+  * Simple fixes for STRICT_SEXP=1.
+
 === 4.12.0 / 2019-03-12
 
 * 3 bug fixes:

data/Manifest.txt

@@ -5,6 +5,7 @@ Rakefile
 lib/composite_sexp_processor.rb
 lib/pt_testcase.rb
 lib/sexp.rb
+lib/sexp_matcher.rb
 lib/sexp_processor.rb
 lib/strict_sexp.rb
 lib/unique.rb

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.2"
+
   license "MIT"
 end
 

data/lib/pt_testcase.rb

@@ -363,26 +363,26 @@ class ParseTreeTestCase < Minitest::Test
   ###
   # 1.9 specific tests
 
-  add_19edgecases("lambda { || (x + 1) }",
+  add_19edgecases("-> () { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args),
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
                   "stabby_args"                   => "->() { (x + 1) }",
                   "stabby_args_doend"             => "->() do (x + 1) end")
 
-  add_19edgecases("lambda { (x + 1) }",
+  add_19edgecases("-> { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     0,
                     s(:call, s(:call, nil, :x), :+, s(:lit, 1))),
                   "stabby_args_0_no_parens"       => "-> { (x + 1) }",
                   "stabby_args_0_no_parens_doend" => "-> do (x + 1) end",
                   "stabby_args_0_spacebar_broken" => "->{x+1}") # I hate you
 
-  add_19edgecases("lambda { |x, y| (x + y) }",
+  add_19edgecases("-> (x, y) { (x + y) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x, :y),
                     s(:call, s(:lvar, :x), :+, s(:lvar, :y))),
                   "stabby_args_2"                 => "->(x, y) { (x + y) }",
@@ -390,9 +390,9 @@ class ParseTreeTestCase < Minitest::Test
                   "stabby_args_2_no_parens"       => "-> x, y { (x + y) }",
                   "stabby_args_2_no_parens_doend" => "-> x, y do (x + y) end")
 
-  add_19edgecases("lambda { |x| (x + 1) }",
+  add_19edgecases("-> (x) { (x + 1) }",
                   s(:iter,
-                    s(:call, nil, :lambda),
+                    s(:lambda),
                     s(:args, :x),
                     s(:call, s(:lvar, :x), :+, s(:lit, 1))),
                   "stabby_args_1"                 => "->(x) { (x + 1) }",
@@ -2080,17 +2080,15 @@ class ParseTreeTestCase < Minitest::Test
             "Ruby"         => "lambda { |a,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a| a }")
+                                s(:args, :a, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_comma2",
-            "Ruby"         => "lambda { |a,b,| a }",
+            "Ruby"         => "lambda { |a, b,| a }",
             "ParseTree"    => s(:iter,
                                 s(:call, nil, :lambda),
-                                s(:args, :a, :b),
-                                s(:lvar, :a)),
-            "Ruby2Ruby"    => "lambda { |a, b| a }")
+                                s(:args, :a, :b, nil),
+                                s(:lvar, :a)))
 
   add_tests("lambda_args_norm_star",
             "Ruby"         => "lambda { |a, *star| star }",

data/lib/sexp.rb

@@ -69,6 +69,14 @@ class Sexp < Array # ZenTest FULL
     obj.class == self.class and super # only because of a bug in ruby
   end
 
+  def eql? o
+    self.class == o.class && super
+  end
+
+  def hash
+    [self.class, *self].hash
+  end
+
   ##
   # Returns true if the node_type is +array+ or +args+.
   #
@@ -202,13 +210,16 @@ class Sexp < Array # ZenTest FULL
     each_sexp.find_all { |sexp| sexp.sexp_type == name }
   end
 
+  UNASSIGNED = Object.new
+
   ##
   # If passed a line number, sets the line and returns self. Otherwise
   # returns the line number. This allows you to do message cascades
   # and still get the sexp back.
 
-  def line n = nil
-    if n then
+  def line n = UNASSIGNED
+    if n != UNASSIGNED then
+      raise ArgumentError, "setting %p.line %p" % [self, n] unless Integer === n
       @line = n
       self
     else
@@ -366,1055 +377,5 @@ def s *args, &blk
   Sexp.new(*args)
 end
 
-class Sexp #:nodoc:
-  ##
-  # Verifies that +pattern+ is a Matcher and then dispatches to its
-  # #=~ method.
-  #
-  # See Matcher.=~
-
-  def =~ pattern
-    raise ArgumentError, "Not a pattern: %p" % [pattern] unless Matcher === pattern
-    pattern =~ self
-  end
-
-  ##
-  # Verifies that +pattern+ is a Matcher and then dispatches to its
-  # #satisfy? method.
-  #
-  # TODO: rename match?
-
-  def satisfy? pattern
-    raise ArgumentError, "Not a pattern: %p" % [pattern] unless Matcher === pattern
-    pattern.satisfy? self
-  end
-
-  ##
-  # Verifies that +pattern+ is a Matcher and then dispatches to its #/
-  # method.
-  #
-  # TODO: rename grep? match_all ? find_all ?
-
-  def / pattern
-    raise ArgumentError, "Not a pattern: %p" % [pattern] unless Matcher === pattern
-    pattern / self
-  end
-
-  ##
-  # Recursively searches for the +pattern+ yielding the matches.
-
-  def search_each pattern, &block # TODO: rename to grep?
-    raise ArgumentError, "Needs a pattern" unless pattern.kind_of? Matcher
-
-    return enum_for(:search_each, pattern) unless block_given?
-
-    if pattern.satisfy? self then
-      yield self
-    end
-
-    self.each_sexp do |subset|
-      subset.search_each pattern, &block
-    end
-  end
-
-  ##
-  # Recursively searches for the +pattern+ yielding each match, and
-  # replacing it with the result of the block.
-  #
-
-  def replace_sexp pattern, &block # TODO: rename to gsub?
-    raise ArgumentError, "Needs a pattern" unless pattern.kind_of? Matcher
-
-    return yield self if pattern.satisfy? self
-
-    # TODO: Needs #new_from(*new_body) to copy file/line/comment
-    self.class.new(*self.map { |subset|
-                     case subset
-                     when Sexp then
-                       subset.replace_sexp pattern, &block
-                     else
-                       subset
-                     end
-                   })
-  end
-
-  ##
-  # Matches an S-Expression.
-  #
-  # See Matcher for examples.
-
-  def self.s *args
-    Matcher.new(*args)
-  end
-
-  ##
-  # Matches any single item.
-  #
-  # See Wild for examples.
-
-  def self._
-    Wild.new
-  end
-
-  # TODO: reorder factory methods and classes to match
-
-  ##
-  # Matches all remaining input.
-  #
-  # See Remaining for examples.
-
-  def self.___
-    Remaining.new
-  end
-
-  ##
-  # Matches an expression or any expression that includes the child.
-  #
-  # See Include for examples.
-
-  def self.include child # TODO: rename, name is generic ruby
-    Include.new(child)
-  end
-
-  ##
-  # Matches any atom.
-  #
-  # See Atom for examples.
-
-  def self.atom
-    Atom.new
-  end
-
-  ##
-  # Matches when any of the sub-expressions match.
-  #
-  # This is also available via Matcher#|.
-  #
-  # See Any for examples.
-
-  def self.any *args
-    Any.new(*args)
-  end
-
-  ##
-  # Matches only when all sub-expressions match.
-  #
-  # This is also available via Matcher#&.
-  #
-  # See All for examples.
-
-  def self.all *args
-    All.new(*args)
-  end
-
-  ##
-  # Matches when sub-expression does not match.
-  #
-  # This is also available via Matcher#-@.
-  #
-  # See Not for examples.
-
-  def self.not? arg
-    Not.new arg
-  end
-
-  # TODO: add Sibling factory method?
-
-  ##
-  # Matches anything that has a child matching the sub-expression.
-  #
-  # See Child for examples.
-
-  def self.child child
-    Child.new child
-  end
-
-  ##
-  # Matches anything having the same sexp_type, which is the first
-  # value in a Sexp.
-  #
-  # See Type for examples.
-
-  def self.t name
-    Type.new name
-  end
-
-  ##
-  # Matches any atom who's string representation matches the patterns
-  # passed in.
-  #
-  # See Pattern for examples.
-
-  def self.m *values
-    res = values.map { |value|
-      case value
-      when Regexp then
-        value
-      else
-        re = Regexp.escape value.to_s
-        Regexp.new "\\A%s\\Z" % re
-      end
-    }
-    Pattern.new Regexp.union(*res)
-  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
-  # strings. Generally you won't use this class directly.
-  #
-  # You would normally create a matcher using the top-level #s method,
-  # but with a block, calling into the Sexp factory methods. For example:
-  #
-  #   s{ s(:class, m(/^Test/), _, ___) }
-  #
-  # This creates a matcher for classes whose names start with "Test".
-  # It uses Sexp.m to create a Sexp::Matcher::Pattern matcher, Sexp._
-  # to create a Sexp::Matcher::Wild matcher, and Sexp.___ to create a
-  # Sexp::Matcher::Remaining matcher. It works like this:
-  #
-  #   s{              # start to create a pattern
-  #     s(            # create a sexp matcher
-  #       :class.     # for class nodes
-  #       m(/^Test/), # matching name slots that start with "Test"
-  #       _,          # any superclass value
-  #       ___         # and whatever is in the class
-  #      )
-  #    }
-  #
-  # Then you can use that with #=~, #/, Sexp#replace_sexp, and others.
-  #
-  # For more examples, see the various Sexp class methods, the examples,
-  # and the tests supplied with Sexp.
-  #
-  # * For pattern creation, see factory methods: Sexp::_, Sexp::___, etc.
-  # * For matching returning truthy/falsey results, see Sexp#=~.
-  # * For case expressions, see Matcher#===.
-  # * For getting all subtree matches, see Sexp#/.
-  #
-  # If rdoc didn't suck, these would all be links.
-
-  class Matcher < Sexp
-    ##
-    # Should #=~ match sub-trees?
-
-    def self.match_subs?
-      @@match_subs
-    end
-
-    ##
-    # Setter for +match_subs?+.
-
-    def self.match_subs= o
-      @@match_subs = o
-    end
-
-    self.match_subs = true
-
-    ##
-    # Does this matcher actually match +o+? Returns falsey if +o+ is
-    # not a Sexp or if any sub-tree of +o+ is not satisfied by or
-    # equal to its corresponding sub-matcher.
-    #
-    #--
-    # TODO: push this up to Sexp and make this the workhorse
-    # TODO: do the same with ===/satisfy?
-
-    def satisfy? o
-      return unless o.kind_of?(Sexp) &&
-        (length == o.length || Matcher === last && last.greedy?)
-
-      each_with_index.all? { |child, i|
-        sexp = o.at i
-        if Sexp === child then # TODO: when will this NOT be a matcher?
-          sexp = o.sexp_body i if child.respond_to?(:greedy?) && child.greedy?
-          child.satisfy? sexp
-        else
-          child == sexp
-        end
-      }
-    end
-
-    ##
-    # Tree equivalent to String#=~, returns true if +self+ matches
-    # +sexp+ as a whole or in a sub-tree (if +match_subs?+).
-    #
-    # TODO: maybe this should NOT be aliased to === ?
-    #
-    # TODO: example
-
-    def =~ sexp
-      raise ArgumentError, "Can't both be matchers: %p" % [sexp] if Matcher === sexp
-
-      self.satisfy?(sexp) ||
-        (self.class.match_subs? && sexp.each_sexp.any? { |sub| self =~ sub })
-    end
-
-    alias === =~ # TODO?: alias === satisfy?
-
-    ##
-    # Searches through +sexp+ for all sub-trees that match this
-    # matcher and returns a MatchCollection for each match.
-    #
-    # TODO: redirect?
-    # Example:
-    #   Q{ s(:b) } / s(:a, s(:b)) => [s(:b)]
-
-    def / sexp
-      raise ArgumentError, "can't both be matchers" if Matcher === sexp
-
-      # TODO: move search_each into matcher?
-      MatchCollection.new sexp.search_each(self).to_a
-    end
-
-    ##
-    # Combines the Matcher with another Matcher, the resulting one will
-    # be satisfied if either Matcher would be satisfied.
-    #
-    # TODO: redirect
-    # Example:
-    #   s(:a) | s(:b)
-
-    def | other
-      Any.new self, other
-    end
-
-    ##
-    # Combines the Matcher with another Matcher, the resulting one will
-    # be satisfied only if both Matchers would be satisfied.
-    #
-    # TODO: redirect
-    # Example:
-    #   t(:a) & include(:b)
-
-    def & other
-      All.new self, other
-    end
-
-    ##
-    # Returns a Matcher that matches whenever this Matcher would not have matched
-    #
-    # Example:
-    #   -s(:a)
-
-    def -@
-      Not.new self
-    end
-
-    ##
-    # Returns a Matcher that matches if this has a sibling +o+
-    #
-    # Example:
-    #   s(:a) >> s(:b)
-
-    def >> other
-      Sibling.new self, other
-    end
-
-    ##
-    # Is this matcher greedy? Defaults to false.
-
-    def greedy?
-      false
-    end
-
-    def inspect # :nodoc:
-      s = super
-      s[0] = "q"
-      s
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "q(", ")" do
-        q.seplist self do |v|
-          q.pp v
-        end
-      end
-    end
-
-    ##
-    # Parse a lispy string representation of a matcher into a Matcher.
-    # See +Parser+.
-
-    def self.parse s
-      Parser.new(s).parse
-    end
-
-    ##
-    # Converts from a lispy string to Sexp matchers in a safe manner.
-    #
-    #   "(a 42 _ (c) [t x] ___)" => s{ s(:a, 42, _, s(:c), t(:x), ___) }
-
-    class Parser
-
-      ##
-      # The stream of tokens to parse. See #lex.
-
-      attr_accessor :tokens
-
-      ##
-      # Create a new Parser instance on +s+
-
-      def initialize s
-        self.tokens = []
-        lex s
-      end
-
-      ##
-      # Converts +s+ into a stream of tokens and adds them to +tokens+.
-
-      def lex s
-        tokens.concat s.scan(%r%[()\[\]]|\"[^"]*\"|/[^/]*/|[\w-]+%) # "
-      end
-
-      ##
-      # Returns the next token and removes it from the stream or raises if empty.
-
-      def next_token
-        raise SyntaxError, "unbalanced input" if tokens.empty?
-        tokens.shift
-      end
-
-      ##
-      # Returns the next token without removing it from the stream.
-
-      def peek_token
-        tokens.first
-      end
-
-      ##
-      # Parses tokens and returns a +Matcher+ instance.
-
-      def parse
-        result = parse_sexp until tokens.empty?
-        result
-      end
-
-      ##
-      # Parses a string into a sexp matcher:
-      #
-      #   SEXP : "(" SEXP:args* ")"          => Sexp.q(*args)
-      #        | "[" CMD:cmd sexp:args* "]"  => Sexp.cmd(*args)
-      #        | "nil"                       => nil
-      #        | /\d+/:n                     => n.to_i
-      #        | "___"                       => Sexp.___
-      #        | "_"                         => Sexp._
-      #        | /^\/(.*)\/$/:re             => Regexp.new re[0]
-      #        | /^"(.*)"$/:s                => String.new s[0]
-      #        | NAME:name                   => name.to_sym
-      #   NAME : /\w+/
-      #    CMD : "t" | "m" | "atom"
-
-      def parse_sexp
-        token = next_token
-
-        case token
-        when "(" then
-          parse_list
-        when "[" then
-          parse_cmd
-        when "nil" then
-          nil
-        when /^\d+$/ then
-          token.to_i
-        when "___" then
-          Sexp.___
-        when "_" then
-          Sexp._
-        when %r%^/(.*)/$% then
-          re = $1
-          raise SyntaxError, "Not allowed: /%p/" % [re] unless
-            re =~ /\A([\w()|.*+^$]+)\z/
-          Regexp.new re
-        when /^"(.*)"$/ then
-          $1
-        when /^\w+$/ then
-          token.to_sym
-        else
-          raise SyntaxError, "unhandled token: %p" % [token]
-        end
-      end
-
-      ##
-      # Parses a balanced list of expressions and returns the
-      # equivalent matcher.
-
-      def parse_list
-        result = []
-
-        result << parse_sexp while peek_token && peek_token != ")"
-        next_token # pop off ")"
-
-        Sexp.s(*result)
-      end
-
-      ##
-      # A collection of allowed commands to convert into matchers.
-
-      ALLOWED = [:t, :m, :atom].freeze
-
-      ##
-      # Parses a balanced command. A command is denoted by square
-      # brackets and must conform to a whitelisted set of allowed
-      # commands (see +ALLOWED+).
-
-      def parse_cmd
-        args = []
-        args << parse_sexp while peek_token && peek_token != "]"
-        next_token # pop off "]"
-
-        cmd = args.shift
-        args = Sexp.s(*args)
-
-        raise SyntaxError, "bad cmd: %p" % [cmd] unless ALLOWED.include? cmd
-
-        result = Sexp.send cmd, *args
-
-        result
-      end
-    end # class Parser
-  end # class Matcher
-
-  ##
-  # Matches any single item.
-  #
-  # examples:
-  #
-  #   s(:a)           / s{ _ }    #=> [s(:a)]
-  #   s(:a, s(s(:b))) / s{ s(_) } #=> [s(s(:b))]
-
-  class Wild < Matcher
-    ##
-    # Matches any single element.
-
-    def satisfy? o
-      true
-    end
-
-    def inspect # :nodoc:
-      "_"
-    end
-
-    def pretty_print q # :nodoc:
-      q.text "_"
-    end
-  end
-
-  ##
-  # Matches all remaining input. If remaining comes before any other
-  # matchers, they will be ignored.
-  #
-  # examples:
-  #
-  #   s(:a)         / s{ s(:a, ___ ) } #=> [s(:a)]
-  #   s(:a, :b, :c) / s{ s(:a, ___ ) } #=> [s(:a, :b, :c)]
-
-  class Remaining < Matcher
-    ##
-    # Always satisfied once this is reached. Think of it as a var arg.
-
-    def satisfy? o
-      true
-    end
-
-    def greedy?
-      true
-    end
-
-    def inspect # :nodoc:
-      "___"
-    end
-
-    def pretty_print q # :nodoc:
-      q.text "___"
-    end
-  end
-
-  ##
-  # Matches when any of the sub-expressions match.
-  #
-  # This is also available via Matcher#|.
-  #
-  # examples:
-  #
-  #   s(:a) / s{ any(s(:a), s(:b)) } #=> [s(:a)]
-  #   s(:a) / s{     s(:a) | s(:b) } #=> [s(:a)] # same thing via |
-  #   s(:a) / s{ any(s(:b), s(:c)) } #=> []
-
-  class Any < Matcher
-    ##
-    # The collection of sub-matchers to match against.
-
-    attr_reader :options
-
-    ##
-    # Create an Any matcher which will match any of the +options+.
-
-    def initialize *options
-      @options = options
-    end
-
-    ##
-    # Satisfied when any sub expressions match +o+
-
-    def satisfy? o
-      options.any? { |exp|
-        Sexp === exp && exp.satisfy?(o) || exp == o
-      }
-    end
-
-    def == o # :nodoc:
-      super && self.options == o.options
-    end
-
-    def inspect # :nodoc:
-      options.map(&:inspect).join(" | ")
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "any(", ")" do
-        q.seplist options do |v|
-          q.pp v
-        end
-      end
-    end
-  end
-
-  ##
-  # Matches only when all sub-expressions match.
-  #
-  # This is also available via Matcher#&.
-  #
-  # examples:
-  #
-  #   s(:a)     / s{ all(s(:a), s(:b)) }    #=> []
-  #   s(:a, :b) / s{ t(:a) & include(:b)) } #=> [s(:a, :b)]
-
-  class All < Matcher
-    ##
-    # The collection of sub-matchers to match against.
-
-    attr_reader :options
-
-    ##
-    # Create an All matcher which will match all of the +options+.
-
-    def initialize *options
-      @options = options
-    end
-
-    ##
-    # Satisfied when all sub expressions match +o+
-
-    def satisfy? o
-      options.all? { |exp|
-        exp.kind_of?(Sexp) ? exp.satisfy?(o) : exp == o
-      }
-    end
-
-    def == o # :nodoc:
-      super && self.options == o.options
-    end
-
-    def inspect # :nodoc:
-      options.map(&:inspect).join(" & ")
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "all(", ")" do
-        q.seplist options do |v|
-          q.pp v
-        end
-      end
-    end
-  end
-
-  ##
-  # Matches when sub-expression does not match.
-  #
-  # This is also available via Matcher#-@.
-  #
-  # examples:
-  #
-  #   s(:a) / s{ not?(s(:b)) } #=> [s(:a)]
-  #   s(:a) / s{ -s(:b) }      #=> [s(:a)]
-  #   s(:a) / s{ s(not? :a) } #=> []
-
-  class Not < Matcher
-
-    ##
-    # The value to negate in the match.
-
-    attr_reader :value
-
-    ##
-    # Creates a Matcher which will match any Sexp that does not match the +value+
-
-    def initialize value
-      @value = value
-    end
-
-    def == o # :nodoc:
-      super && self.value == o.value
-    end
-
-    ##
-    # Satisfied if a +o+ does not match the +value+
-
-    def satisfy? o
-      !(value.kind_of?(Sexp) ? value.satisfy?(o) : value == o)
-    end
-
-    def inspect # :nodoc:
-      "not?(%p)" % [value]
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "not?(", ")" do
-        q.pp value
-      end
-    end
-  end
-
-  ##
-  # Matches anything that has a child matching the sub-expression
-  #
-  # example:
-  #
-  #   s(s(s(s(s(:a))))) / s{ child(s(:a)) } #=> [s(s(s(s(s(:a))))),
-  #                                              s(s(s(s(:a)))),
-  #                                              s(s(s(:a))),
-  #                                              s(s(:a)),
-  #                                              s(:a)]
-
-  class Child < Matcher
-    ##
-    # The child to match.
-
-    attr_reader :child
-
-    ##
-    # Create a Child matcher which will match anything having a
-    # descendant matching +child+.
-
-    def initialize child
-      @child = child
-    end
-
-    ##
-    # Satisfied if matches +child+ or +o+ has a descendant matching
-    # +child+.
-
-    def satisfy? o
-      if child.satisfy? o
-        true
-      elsif o.kind_of? Sexp
-        o.search_each(child).any?
-      end
-    end
-
-    def == o # :nodoc:
-      super && self.child == o.child
-    end
-
-    def inspect # :nodoc:
-      "child(%p)" % [child]
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "child(", ")" do
-        q.pp child
-      end
-    end
-  end
-
-  ##
-  # Matches any atom (non-Sexp).
-  #
-  # examples:
-  #
-  #   s(:a)        / s{ s(atom) } #=> [s(:a)]
-  #   s(:a, s(:b)) / s{ s(atom) } #=> [s(:b)]
-
-  class Atom < Matcher
-    ##
-    # Satisfied when +o+ is an atom.
-
-    def satisfy? o
-      !(o.kind_of? Sexp)
-    end
-
-    def inspect #:nodoc:
-      "atom"
-    end
-
-    def pretty_print q # :nodoc:
-      q.text "atom"
-    end
-  end
-
-  ##
-  # Matches any atom who's string representation matches the patterns
-  # passed in.
-  #
-  # examples:
-  #
-  #   s(:a) / s{ m('a') }                                      #=> [s(:a)]
-  #   s(:a) / s{ m(/\w/,/\d/) }                                #=> [s(:a)]
-  #   s(:tests, s(s(:test_a), s(:test_b))) / s{ m(/test_\w/) } #=> [s(:test_a),
-  #
-  # TODO: maybe don't require non-sexps? This does respond to =~ now.
-
-  class Pattern < Matcher
-
-    ##
-    # The regexp to match for the pattern.
-
-    attr_reader :pattern
-
-    def == o # :nodoc:
-      super && self.pattern == o.pattern
-    end
-
-    ##
-    # Create a Patten matcher which will match any atom that either
-    # matches the input +pattern+.
-
-    def initialize pattern
-      @pattern = pattern
-    end
-
-    ##
-    # Satisfied if +o+ is an atom, and +o+ matches +pattern+
-
-    def satisfy? o
-      !o.kind_of?(Sexp) && o.to_s =~ pattern # TODO: question to_s
-    end
-
-    def inspect # :nodoc:
-      "m(%p)" % pattern
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "m(", ")" do
-        q.pp pattern
-      end
-    end
-  end
-
-  ##
-  # Matches anything having the same sexp_type, which is the first
-  # value in a Sexp.
-  #
-  # examples:
-  #
-  #   s(:a, :b) / s{ t(:a) }        #=> [s(:a, :b)]
-  #   s(:a, :b) / s{ t(:b) }        #=> []
-  #   s(:a, s(:b, :c)) / s{ t(:b) } #=> [s(:b, :c)]
-
-  class Type < Matcher
-    attr_reader :sexp_type
-
-    ##
-    # Creates a Matcher which will match any Sexp who's type is +type+, where a type is
-    # the first element in the Sexp.
-
-    def initialize type
-      @sexp_type = type
-    end
-
-    def == o # :nodoc:
-      super && self.sexp_type == o.sexp_type
-    end
-
-    ##
-    # Satisfied if the sexp_type of +o+ is +type+.
-
-    def satisfy? o
-      o.kind_of?(Sexp) && o.sexp_type == sexp_type
-    end
-
-    def inspect # :nodoc:
-      "t(%p)" % sexp_type
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "t(", ")" do
-        q.pp sexp_type
-      end
-    end
-  end
-
-  ##
-  # Matches an expression or any expression that includes the child.
-  #
-  # examples:
-  #
-  #   s(:a, :b)   / s{ include(:b) } #=> [s(:a, :b)]
-  #   s(s(s(:a))) / s{ include(:a) } #=> [s(:a)]
-
-  class Include < Matcher
-    ##
-    # The value that should be included in the match.
-
-    attr_reader :value
-
-    ##
-    # Creates a Matcher which will match any Sexp that contains the
-    # +value+.
-
-    def initialize value
-      @value = value
-    end
-
-    ##
-    # Satisfied if a +o+ is a Sexp and one of +o+'s elements matches
-    # value
-
-    def satisfy? o
-      Sexp === o && o.any? { |c|
-        # TODO: switch to respond_to??
-        Sexp === value ? value.satisfy?(c) : value == c
-      }
-    end
-
-    def == o # :nodoc:
-      super && self.value == o.value
-    end
-
-    def inspect # :nodoc:
-      "include(%p)" % [value]
-    end
-
-    def pretty_print q # :nodoc:
-      q.group 1, "include(", ")" do
-        q.pp value
-      end
-    end
-  end
-
-  ##
-  # See Matcher for sibling relations: <,<<,>>,>
-
-  class Sibling < Matcher
-
-    ##
-    # The LHS of the matcher.
-
-    attr_reader :subject
-
-    ##
-    # The RHS of the matcher.
-
-    attr_reader :sibling
-
-    ##
-    # An optional distance requirement for the matcher.
-
-    attr_reader :distance
-
-    ##
-    # Creates a Matcher which will match any pair of Sexps that are siblings.
-    # Defaults to matching the immediate following sibling.
-
-    def initialize subject, sibling, distance = nil
-      @subject = subject
-      @sibling = sibling
-      @distance = distance
-    end
-
-    ##
-    # Satisfied if o contains +subject+ followed by +sibling+
-
-    def satisfy? o
-      # Future optimizations:
-      # * Shortcut matching sibling
-      subject_matches = index_matches(subject, o)
-      return nil if subject_matches.empty?
-
-      sibling_matches = index_matches(sibling, o)
-      return nil if sibling_matches.empty?
-
-      subject_matches.any? { |i1, _data_1|
-        sibling_matches.any? { |i2, _data_2|
-          distance ? (i2-i1 == distance) : i2 > i1
-        }
-      }
-    end
-
-    def == o # :nodoc:
-      super &&
-        self.subject  == o.subject &&
-        self.sibling  == o.sibling &&
-        self.distance == o.distance
-    end
-
-    def inspect # :nodoc:
-      "%p >> %p" % [subject, sibling]
-    end
-
-    def pretty_print q # :nodoc:
-      if distance then
-        q.group 1, "sibling(", ")" do
-          q.seplist [subject, sibling, distance] do |v|
-            q.pp v
-          end
-        end
-      else
-        q.group 1 do
-          q.pp subject
-          q.text " >> "
-          q.pp sibling
-        end
-      end
-    end
-
-    private
-
-    def index_matches pattern, o
-      indexes = []
-      return indexes unless o.kind_of? Sexp
-
-      o.each_with_index do |e, i|
-        data = {}
-        if pattern.kind_of?(Sexp) ? pattern.satisfy?(e) : pattern == o[i]
-          indexes << [i, data]
-        end
-      end
-
-      indexes
-    end
-  end # class Sibling
-
-  ##
-  # Wraps the results of a Sexp query. MatchCollection defines
-  # MatchCollection#/ so that you can chain queries.
-  #
-  # For instance:
-  #   res = s(:a, s(:b)) / s{ s(:a,_) } / s{ s(:b) }
-
-  class MatchCollection < Array
-    ##
-    # See Traverse#search
-
-    def / pattern
-      inject(self.class.new) { |result, match|
-        result.concat match / pattern
-      }
-    end
-
-    def inspect # :nodoc:
-      "MatchCollection.new(%s)" % self.to_a.inspect[1..-2]
-    end
-
-    alias :to_s :inspect # :nodoc:
-
-    def pretty_print q # :nodoc:
-      q.group 1, "MatchCollection.new(", ")" do
-        q.seplist(self) {|v| q.pp v }
-      end
-    end
-  end # class MatchCollection
-end
-
+require "sexp_matcher" unless defined? Sexp::Matcher
 require "strict_sexp" if ENV["STRICT_SEXP"].to_i > 0