mutant 0.5.23 → 0.5.24

data/lib/mutant/ast/node_predicates.rb

@@ -0,0 +1,19 @@
+module Mutant
+  module AST
+    # Module for node predicates
+    module NodePredicates
+
+      Types::ALL.each do |type|
+        fail "method: #{type} is already defined" if instance_methods(true).include?(type)
+
+        name = "n_#{type.to_s.chomp('?')}?"
+
+        define_method(name) do |node|
+          node.type.equal?(type)
+        end
+        private name
+      end
+
+    end # NodePredicates
+  end # AST
+end # Mutant

data/lib/mutant/ast/nodes.rb

@@ -0,0 +1,21 @@
+module Mutant
+  module AST
+    # Singleton nodes
+    module Nodes
+      extend Sexp
+
+      N_NAN               = s(:send, s(:float,  0.0), :/, s(:float, 0.0))
+      N_INFINITY          = s(:send, s(:float,  1.0), :/, s(:float, 0.0))
+      N_NEGATIVE_INFINITY = s(:send, s(:float, -1.0), :/, s(:float, 0.0))
+      N_RAISE             = s(:send, nil, :raise)
+      N_TRUE              = s(:true)
+      N_FALSE             = s(:false)
+      N_NIL               = s(:nil)
+      N_EMPTY             = s(:empty)
+      N_SELF              = s(:self)
+      N_ZSUPER            = s(:zsuper)
+      N_EMPTY_SUPER       = s(:super)
+
+    end # Node
+  end # AST
+end # Mutant

data/lib/mutant/ast/sexp.rb

@@ -0,0 +1,34 @@
+module Mutant
+  module AST
+    # Mixin for node sexp syntax
+    module Sexp
+
+    private
+
+      # Build node
+      #
+      # @param [Symbol] type
+      #
+      # @return [Parser::AST::Node]
+      #
+      # @api private
+      #
+      def s(type, *children)
+        Parser::AST::Node.new(type, children)
+      end
+
+      # Build a negated boolean node
+      #
+      # @param [Parser::AST::Node] node
+      #
+      # @return [Parser::AST::Node]
+      #
+      # @api private
+      #
+      def n_not(node)
+        s(:send, node, :!)
+      end
+
+    end # Sexp
+  end # AST
+end # Mutant

data/lib/mutant/ast/types.rb

@@ -0,0 +1,48 @@
+module Mutant
+  module AST
+    # Groups of node types
+    module Types
+      symbolset = ->(strings) { strings.map(&:to_sym).to_set.freeze }
+
+      ASSIGNABLE_VARIABLES = symbolset.(%w[ivasgn lvasgn cvasgn gvasgn])
+
+      INDEX_ASSIGN_OPERATOR = :[]=
+
+      # Set of nodes that cannot be on the LHS of an assignment
+      NOT_ASSIGNABLE         = symbolset.(%w[int float str dstr class module self nil])
+
+      # Set of op-assign types
+      OP_ASSIGN              = symbolset.(%w[or_asgn and_asgn op_asgn])
+      # Set of node types that are not valid when emitted standalone
+      NOT_STANDALONE         = symbolset.(%w[splat restarg block_pass])
+      INDEX_OPERATORS        = symbolset.(%w[[] []=])
+      UNARY_METHOD_OPERATORS = symbolset.(%w[~@ +@ -@ !])
+
+      # Operators ruby implementeds as methods
+      METHOD_OPERATORS = symbolset.(%w[
+        <=> === []= [] <= >= == !~ != =~ <<
+        >> ** * % / | ^ & < > + - ~@ +@ -@ !
+      ])
+
+      BINARY_METHOD_OPERATORS = (
+        METHOD_OPERATORS - (INDEX_OPERATORS + UNARY_METHOD_OPERATORS)
+      ).to_set.freeze
+
+      OPERATOR_METHODS = (
+        METHOD_OPERATORS + INDEX_OPERATORS + UNARY_METHOD_OPERATORS
+      ).to_set.freeze
+
+      # Nodes that are NOT handled by mutant.
+      #
+      # not - 1.8 only, mutant does not support 1.8
+      #
+      BLACKLIST = symbolset.(%w[not])
+
+      # Nodes that are NOT generated by parser but used by mutant / unparser.
+      EXTRA = symbolset.(%w[empty])
+
+      # All node types mutant handles
+      ALL = ((Parser::Meta::NODE_TYPES + EXTRA) - BLACKLIST).to_set.freeze
+    end # Types
+  end # AST
+end # Mutant

data/lib/mutant/cache.rb

@@ -1,8 +1,7 @@
 module Mutant
   # An AST cache
   class Cache
-    # This is explicitly empty! Ask me if you are interested in reasons :D
-    include Equalizer.new
+    include Equalizer.new, Adamantium::Mutable
 
     # Initialize object
     #
@@ -16,6 +15,8 @@ module Mutant
 
     # Return node for file
     #
+    # @param [#to_s] path
+    #
     # @return [AST::Node]
     #
     # @api private

data/lib/mutant/cli.rb

@@ -4,7 +4,7 @@ module Mutant
 
   # Comandline parser
   class CLI
-    include Adamantium::Flat, Equalizer.new(:config), NodeHelpers
+    include Adamantium::Flat, Equalizer.new(:config)
 
     # Error raised when CLI argv is invalid
     Error = Class.new(RuntimeError)
@@ -30,141 +30,6 @@ module Mutant
       EXIT_FAILURE
     end
 
-    # Builder for configuration components
-    class Builder
-      include NodeHelpers
-
-      # Initalize object
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def initialize
-        @matchers          = []
-        @subject_ignores   = []
-        @subject_selectors = []
-      end
-
-      # Add a subject ignore
-      #
-      # @param [Matcher]
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_subject_ignore(matcher)
-        @subject_ignores << matcher
-        self
-      end
-
-      # Add a subject selector
-      #
-      # @param [#call] selector
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_subject_selector(selector)
-        @subject_selectors << selector
-        self
-      end
-
-      # Add a subject matcher
-      #
-      # @param [#call] selector
-      #
-      # @return [self]
-      #
-      # @api private
-      #
-      def add_matcher(matcher)
-        @matchers << matcher
-        self
-      end
-
-      # Return generated matcher
-      #
-      # @return [Mutant::Matcher]
-      #
-      # @api private
-      #
-      def matcher
-        if @matchers.empty?
-          raise(Error, 'No patterns given')
-        end
-
-        matcher = Matcher::Chain.build(@matchers)
-
-        if predicate
-          Matcher::Filter.new(matcher, predicate)
-        else
-          matcher
-        end
-      end
-
-    private
-
-      # Return subject selector
-      #
-      # @return [#call]
-      #   if selector is present
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def subject_selector
-        Morpher::Evaluator::Predicate::Boolean::Or.new(@subject_selectors) if @subject_selectors.any?
-      end
-
-      # Return predicate
-      #
-      # @return [#call]
-      #   if filter is needed
-      #
-      # @return [nil]
-      #   othrwise
-      #
-      # @api private
-      #
-      def predicate
-        if subject_selector && subject_rejector
-          Morpher::Evaluator::Predicate::Boolean::And.new([
-            subject_selector,
-            Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-          ])
-        elsif subject_selector
-          subject_selector
-        elsif subject_rejector
-          Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-        else
-          nil
-        end
-      end
-
-      # Return subject rejector
-      #
-      # @return [#call]
-      #   if there is a subject rejector
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def subject_rejector
-        rejectors = @subject_ignores.flat_map(&:to_a).map do |subject|
-          Morpher.compile(s(:eql, s(:attribute, :identification), s(:static, subject.identification)))
-        end
-
-        Morpher::Evaluator::Predicate::Boolean::Or.new(rejectors) if rejectors.any?
-      end
-    end
-
     # Initialize objecct
     #
     # @param [Array<String>]
@@ -174,18 +39,16 @@ module Mutant
     # @api private
     #
     def initialize(arguments = [])
-      @builder = Builder.new
+      @builder = Matcher::Builder.new(Env::Boot.new(Reporter::CLI.new($stderr), Cache.new))
       @debug = @fail_fast = @zombie = false
       @expected_coverage = 100.0
-      @strategy = Strategy::Null.new
-      @cache = Mutant::Cache.new
+      @integration = Integration::Null.new
       parse(arguments)
       @config  = Config.new(
-        cache:             @cache,
         zombie:            @zombie,
         debug:             @debug,
         matcher:           @builder.matcher,
-        strategy:          @strategy,
+        integration:       @integration,
         fail_fast:         @fail_fast,
         reporter:          Reporter::CLI.new($stdout),
         expected_coverage: @expected_coverage
@@ -236,19 +99,16 @@ module Mutant
 
     # Parse matchers
     #
-    # @param [Enumerable<String>] patterns
+    # @param [Array<String>] patterns
     #
     # @return [undefined]
     #
     # @api private
     #
     def parse_matchers(patterns)
+      raise Error, 'No patterns given' if patterns.empty?
       patterns.each do |pattern|
-        expression = Expression.parse(pattern)
-        unless expression
-          raise Error, "Invalid mutant expression: #{pattern.inspect}"
-        end
-        @builder.add_matcher(expression.matcher(@cache))
+        @builder.add_match_expression(Expression.parse(pattern))
       end
     end
 
@@ -283,8 +143,8 @@ module Mutant
     # @api private
     #
     def use(name)
-      require "mutant/#{name}"
-      @strategy = Strategy.lookup(name).new
+      require "mutant/integration/#{name}"
+      @integration = Integration.lookup(name).new
     rescue LoadError
       $stderr.puts("Cannot load plugin: #{name.inspect}")
       raise
@@ -319,10 +179,10 @@ module Mutant
     #
     def add_filter_options(opts)
       opts.on('--ignore-subject PATTERN', 'Ignore subjects that match PATTERN') do |pattern|
-        @builder.add_subject_ignore(Expression.parse(pattern).matcher(@cache))
+        @builder.add_subject_ignore(Expression.parse(pattern))
       end
       opts.on('--code CODE', 'Scope execution to subjects with CODE') do |code|
-        @builder.add_subject_selector(Morpher.compile(s(:eql, s(:attribute, :code), s(:static, code))))
+        @builder.add_subject_selector(:code, code)
       end
     end
 

data/lib/mutant/config.rb

@@ -2,9 +2,8 @@ module Mutant
   # The configuration of a mutator run
   class Config
     include Adamantium::Flat, Anima.new(
-      :cache,
       :debug,
-      :strategy,
+      :integration,
       :matcher,
       :reporter,
       :fail_fast,
@@ -30,5 +29,26 @@ module Mutant
       self
     end
 
+    # Return tests for mutation
+    #
+    # TODO: This logic is now centralized but still fucked.
+    #
+    # @param [Mutation] mutation
+    #
+    # @return [Enumerable<Test>]
+    #
+    # @api private
+    #
+    def tests(subject)
+      subject.match_expressions.each do |match_expression|
+        tests = integration.all_tests.select do |test|
+          match_expression.prefix?(test.expression)
+        end
+        return tests if tests.any?
+      end
+
+      EMPTY_ARRAY
+    end
+
   end # Config
 end # Mutant

data/lib/mutant/context/scope.rb

@@ -2,8 +2,10 @@ module Mutant
   class Context
     # Scope context for mutation (Class or Module)
     class Scope < self
-      include Adamantium::Flat, Equalizer.new(:scope, :source_path)
-      extend NodeHelpers
+      include Adamantium::Flat, Concord::Public.new(:scope, :source_path)
+      extend AST::Sexp
+
+      NAMESPACE_DELIMITER = '::'.freeze
 
       # Return AST wrapping mutated node
       #
@@ -41,7 +43,7 @@ module Mutant
       # @api private
       #
       def self.wrap(scope, node)
-        name = s(:const, nil, scope.name.split('::').last.to_sym)
+        name = s(:const, nil, scope.name.split(NAMESPACE_DELIMITER).last.to_sym)
         case scope
         when ::Class
           s(:class, name, nil, node)
@@ -87,18 +89,18 @@ module Mutant
         scope.name
       end
 
-      # Return match prefixes
+      # Return match expressions
       #
-      # @return [Enumerable<String>]
+      # @return [Enumerable<Expression>]
       #
       # @api private
       #
-      def match_prefixes
+      def match_expressions
         name_nesting.each_index.reverse_each.map do |index|
-          name_nesting.take(index.succ).join('::')
+          Expression.parse("#{name_nesting.take(index.succ).join(NAMESPACE_DELIMITER)}*")
         end
       end
-      memoize :match_prefixes
+      memoize :match_expressions
 
       # Return scope wrapped by context
       #
@@ -110,18 +112,6 @@ module Mutant
 
     private
 
-      # Initialize object
-      #
-      # @param [Object] scope
-      # @param [String] source_path
-      #
-      # @api private
-      #
-      def initialize(scope, source_path)
-        super(source_path)
-        @scope = scope
-      end
-
       # Return nesting of names of scope
       #
       # @return [Array<String>]
@@ -129,7 +119,7 @@ module Mutant
       # @api private
       #
       def name_nesting
-        scope.name.split('::')
+        scope.name.split(NAMESPACE_DELIMITER)
       end
       memoize :name_nesting