mutant 0.11.13 → 0.11.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c08faadc47c13b47986719ddba1ca0437797643ff67c4d16869f6e195352fa2
-  data.tar.gz: 3ea0e03ddff19eb0ae3566e611fbd2171dd0624cbae5c40903c4cbf3ade98ebb
+  metadata.gz: 58b6affbd17beee4a525b5efa35e83b18d3d65316ec5abd2b773c4722377e79b
+  data.tar.gz: 10b60ffd99ea8b477537bed09af2c122ffc14152a69c9a020ed09cca73dfa2d8
 SHA512:
-  metadata.gz: c18497e6427a64d05f11dab3a0a177c2bdb99c00a5acb7984bfa76ef7083628afa16ede769a2152b06101dfe0876bd38de02633f8082b38baf1fef7e8c08576b
-  data.tar.gz: 96348aa482664e934312d7e6fc363b69d94f5158bbb5af7feaef329814769cc645c1474625675e2def3aab0fafc3ab164fe151958a2650019c45084eeb6bfe87
+  metadata.gz: 39bd2f27290e3e3ba1ec6be8ae515759db5970fe121e9732797819bcb243c1038b0582c49e52fe7c6ab99d9332dfce4eb4fcf62b75558bd79954929bb432a8fd
+  data.tar.gz: da7555f1f168b6359163aeb3cd58dd69b5cb553da005830169cabdc9de949317f7ddae0790e6e84cc7990dfcd3d7c0c2c9b85f05c0b7b8de18bf96079d2c58e7

data/lib/mutant/ast/find_metaclass_containing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Given an AST, finds the sclass that directly(-ish) contains the provided
     # node.
     # This won't match arbitrarily complex structures - it only searches the
@@ -10,7 +10,7 @@ module Mutant
     # Descending into 'begin' nodes is supported because these are generated for
     # the one-line syntax class << self; def foo; end
     class FindMetaclassContaining
-      include NodePredicates, Concord.new(:root, :target), Procto
+      include NodePredicates, Concord.new(:ast, :target), Procto
 
       SCLASS_BODY_INDEX = 1
 
@@ -22,11 +22,11 @@ module Mutant
       #
       # @api private
       def call
-        AST.find_last_path(root) do |current|
-          next unless n_sclass?(current)
+        Structure.for(ast.node.type).each_node(ast.node) do |current|
+          return current if n_sclass?(current) && metaclass_of?(current)
+        end
 
-          metaclass_of?(current)
-        end.last
+        nil
       end
 
     private

data/lib/mutant/ast/meta/const.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
 

data/lib/mutant/ast/meta/optarg.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
 

data/lib/mutant/ast/meta/resbody.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
 

data/lib/mutant/ast/meta/send.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
 

data/lib/mutant/ast/meta/symbol.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
 

data/lib/mutant/ast/meta.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Node meta information mixin
     module Meta
     end # Meta

data/lib/mutant/ast/named_children.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
 
     # Helper methods to define named children
     module NamedChildren

data/lib/mutant/ast/node_predicates.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Module for node predicates
     module NodePredicates
 

data/lib/mutant/ast/nodes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Singleton nodes
     module Nodes
       extend Sexp

data/lib/mutant/ast/pattern/lexer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     class Pattern
       # rubocop:disable Metrics/ClassLength
       class Lexer

data/lib/mutant/ast/pattern/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # rubocop:disable Metrics/ClassLength
     # rubocop:disable Metrics/MethodLength
     class Pattern

data/lib/mutant/ast/pattern/source.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     class Pattern
       class Source
         include Anima.new(:string)

data/lib/mutant/ast/pattern/token.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     class Pattern
       class Token
         include Anima.new(:type, :value, :location)

data/lib/mutant/ast/pattern.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     class Pattern
       include Adamantium
 

data/lib/mutant/ast/regexp/transformer/direct.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for nodes which map directly to other domain

data/lib/mutant/ast/regexp/transformer/named_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for named groups

data/lib/mutant/ast/regexp/transformer/options_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for option groups

data/lib/mutant/ast/regexp/transformer/quantifier.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for regexp quantifiers

data/lib/mutant/ast/regexp/transformer/recursive.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for nodes with children

data/lib/mutant/ast/regexp/transformer/root.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Transformer for root nodes

data/lib/mutant/ast/regexp/transformer/text.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       class Transformer
         # Regexp AST transformer for nodes that encode a text value

data/lib/mutant/ast/regexp/transformer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     module Regexp
       # Regexp bijective mapper
       #

data/lib/mutant/ast/regexp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Regexp source mapper
     module Regexp
       # Parse regex string into expression

data/lib/mutant/ast/sexp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Mixin for node sexp syntax
     module Sexp
 

data/lib/mutant/ast/structure.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # AST Structure metadata
     # rubocop:disable Metrics/ModuleLength
     module Structure
@@ -26,7 +26,7 @@ module Mutant
           end
 
           def value(node)
-            node.children.fetch(index)
+            node.children.at(index)
           end
         end
 
@@ -246,7 +246,7 @@ module Mutant
           type:     :class,
           fixed:    Node.fixed(
             [
-              [Node::Fixed::Descendant, :name],
+              [Node::Fixed::Attribute, :name],
               [Node::Fixed::Descendant, :superclass],
               [Node::Fixed::Descendant, :body]
             ]
@@ -386,6 +386,11 @@ module Mutant
           fixed:    Node.fixed([[Node::Fixed::Attribute, :value]]),
           variable: nil
         ),
+        Node.new(
+          type:     :forwarded_args,
+          fixed:    EMPTY_ARRAY,
+          variable: nil
+        ),
         Node.new(
           type:     :for,
           fixed:    Node.fixed(

data/lib/mutant/ast/types.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Mutant
-  module AST
+  class AST
     # Groups of node types
     module Types # rubocop:disable Metrics/ModuleLength
       ASSIGNABLE_VARIABLES = Set.new(%i[ivasgn lvasgn cvasgn gvasgn]).freeze

data/lib/mutant/ast.rb

@@ -1,41 +1,43 @@
 # frozen_string_literal: true
 
 module Mutant
-  # AST helpers
-  module AST
-
-    # Find last node satisfying predicate (as block)
-    #
-    # @return [Parser::AST::Node]
-    #   if satisfying node is found
-    #
-    # @yield [Parser::AST::Node]
-    #
-    # @yieldreturn [Boolean]
-    #   true in case node satisfies predicate
-    #
-    # @return [nil]
-    #   otherwise
-    def self.find_last_path(node, &predicate)
-      fail ArgumentError, 'block expected' unless block_given?
-      path = []
-      walk(node, [node]) do |candidate, stack|
-        if predicate.call(candidate)
-          path = stack.dup
-        end
+  class AST
+    include Adamantium, Anima.new(
+      :node,
+      :comment_associations
+    )
+
+    class View
+      include Adamantium, Anima.new(:node, :path)
+    end
+
+    def on_line(line)
+      line_map.fetch(line, EMPTY_HASH).map do |node, path|
+        View.new(node: node, path: path)
+      end
+    end
+
+  private
+
+    def line_map
+      line_map = {}
+
+      walk_path(node) do |node, path|
+        expression = node.location.expression || next
+        (line_map[expression.line] ||= []) << [node, path]
       end
-      path
+
+      line_map
     end
+    memoize :line_map
 
-    def self.walk(node, stack, &block)
-      block.call(node, stack)
+    def walk_path(node, stack = [node.type], &block)
+      block.call(node, stack.dup)
       node.children.grep(::Parser::AST::Node) do |child|
-        stack.push(child)
-        walk(child, stack, &block)
+        stack.push(child.type)
+        walk_path(child, stack, &block)
         stack.pop
       end
     end
-    private_class_method :walk
-
   end # AST
 end # Mutant

data/lib/mutant/config.rb

@@ -42,7 +42,7 @@ module Mutant
     MUTATION_TIMEOUT_DEPRECATION = <<~'MESSAGE'
       Deprecated configuration toplevel key `mutation_timeout` found.
 
-      This key will be removed in the next mayor version.
+      This key will be removed in the next major version.
       Instead place your mutation timeout configuration under the `mutation` key
       like this:
 

data/lib/mutant/matcher/method/instance.rb

@@ -30,8 +30,9 @@ module Mutant
 
         # Instance method specific evaluator
         class Evaluator < Evaluator
-          SUBJECT_CLASS = Subject::Method::Instance
-          NAME_INDEX    = 0
+          MATCH_NODE_TYPE = :def
+          NAME_INDEX      = 0
+          SUBJECT_CLASS   = Subject::Method::Instance
 
         private
 

data/lib/mutant/matcher/method/metaclass.rb

@@ -22,10 +22,11 @@ module Mutant
         # Metaclass method evaluator
         class Evaluator < Evaluator
           # Terminology note: the "receiver" is the `self` in `class << self`
-          SUBJECT_CLASS         = Subject::Method::Metaclass
-          NAME_INDEX            = 0
           CONST_NAME_INDEX      = 1
+          MATCH_NODE_TYPE       = :def
+          NAME_INDEX            = 0
           SCLASS_RECEIVER_INDEX = 0
+          SUBJECT_CLASS         = Subject::Method::Metaclass
           RECEIVER_WARNING      = 'Can only match :def inside :sclass on ' \
                                   ':self or :const, got :sclass on %p ' \
                                   'unable to match'
@@ -45,7 +46,7 @@ module Mutant
           end
 
           def metaclass_containing(node)
-            AST::FindMetaclassContaining.call(ast.node, node)
+            AST::FindMetaclassContaining.call(ast, node)
           end
 
           def line?(node)

data/lib/mutant/matcher/method/singleton.rb

@@ -18,10 +18,11 @@ module Mutant
 
         # Singleton method evaluator
         class Evaluator < Evaluator
-          SUBJECT_CLASS    = Subject::Method::Singleton
-          RECEIVER_INDEX   = 0
+          MATCH_NODE_TYPE  = :defs
           NAME_INDEX       = 1
+          RECEIVER_INDEX   = 0
           RECEIVER_WARNING = 'Can only match :defs on :self or :const got %p unable to match'
+          SUBJECT_CLASS    = Subject::Method::Singleton
 
         private
 

data/lib/mutant/matcher/method.rb

@@ -41,23 +41,38 @@ module Mutant
         #
         # @return [Enumerable<Subject>]
         def call
-          return EMPTY_ARRAY if skip?
+          location = source_location
+
+          if location.nil? || !location.first.end_with?('.rb')
+            env.warn(SOURCE_LOCATION_WARNING_FORMAT % target_method)
 
-          [subject].compact
+            return EMPTY_ARRAY
+          end
+
+          match_view
         end
 
       private
 
-        def skip?
-          location = source_location
-
-          file = location&.first
+        def match_view
+          return EMPTY_ARRAY if matched_view.nil?
 
-          if location.nil? || !file.end_with?('.rb')
-            env.warn(SOURCE_LOCATION_WARNING_FORMAT % target_method)
-          elsif matched_node_path.any?(&method(:n_block?))
+          if matched_view.path.any?(&:block.public_method(:equal?))
             env.warn(CLOSURE_WARNING_FORMAT % target_method)
+
+            return EMPTY_ARRAY
           end
+
+          [subject]
+        end
+
+        def subject
+          self.class::SUBJECT_CLASS.new(
+            config:     subject_config(matched_view.node),
+            context:    context,
+            node:       matched_view.node,
+            visibility: visibility
+          )
         end
 
         def method_name
@@ -95,17 +110,6 @@ module Mutant
           T::Private::Methods.signature_for_method(target_method)
         end
 
-        def subject
-          node = matched_node_path.last || return
-
-          self.class::SUBJECT_CLASS.new(
-            config:     subject_config(node),
-            context:    context,
-            node:       node,
-            visibility: visibility
-          )
-        end
-
         def subject_config(node)
           Subject::Config.parse(
             comments: ast.comment_associations.fetch(node, []),
@@ -113,10 +117,15 @@ module Mutant
           )
         end
 
-        def matched_node_path
-          AST.find_last_path(ast.node, &method(:match?))
+        def matched_view
+          return if source_location.nil?
+
+          ast
+            .on_line(source_line)
+            .select { |view| view.node.type.eql?(self.class::MATCH_NODE_TYPE) && match?(view.node) }
+            .last
         end
-        memoize :matched_node_path
+        memoize :matched_view
 
         def visibility
           # This can be cleaned up once we are on >ruby-3.0

data/lib/mutant/mutator/node/block.rb

@@ -38,9 +38,11 @@ module Mutant
         end
 
         def body_has_control?
-          AST.find_last_path(body) do |node|
-            n_break?(node) || n_next?(node)
-          end.any?
+          AST::Structure.for(body.type).each_node(body) do |node|
+            return true if n_break?(node) || n_next?(node)
+          end
+
+          false
         end
 
         def mutate_body_receiver

data/lib/mutant/parser.rb

@@ -5,13 +5,6 @@ module Mutant
   class Parser
     include Adamantium, Equalizer.new
 
-    class AST
-      include Anima.new(
-        :node,
-        :comment_associations
-      )
-    end
-
     # Initialize object
     #
     # @return [undefined]

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # Current mutant version
-  VERSION = '0.11.13'
+  VERSION = '0.11.14'
 end # Mutant

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.11.13
+  version: 0.11.14
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs
@@ -393,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: ''