mutant 0.2.12 → 0.2.13

data/lib/mutant/matcher/scope_methods.rb

@@ -106,7 +106,7 @@ module Mutant
       abstract_method :method_names
 
       class Singleton < self
-        MATCHER = Mutant::Matcher::Method::Singleton
+        MATCHER = Matcher::Method::Singleton
 
         # Return method for name
         #
@@ -141,7 +141,7 @@ module Mutant
       end
 
       class Instance < self
-        MATCHER = Mutant::Matcher::Method::Instance
+        MATCHER = Matcher::Method::Instance
 
         # Return method for name
         #

data/lib/mutant/mutation.rb

@@ -37,7 +37,7 @@ module Mutant
     # @api private
     #
     def insert
-      Loader::Eval.run(root, subject.source_path, subject.source_line)
+      Loader::Eval.run(root, subject)
       self
     end
 
@@ -110,9 +110,10 @@ module Mutant
       @subject, @node = subject, node
     end
 
+    # Noop mutation
     class Noop < self
 
-      # Initialihe object
+      # Initialize object
       #
       # @param [Subject] subject
       #

data/lib/mutant/mutation/filter/whitelist.rb

@@ -1,6 +1,8 @@
 module Mutant
   class Mutation
     class Filter
+
+      # Whiltelist filter
       class Whitelist < self
         include Adamantium::Flat, Equalizer.new(:whitelist)
 

data/lib/mutant/mutator/node.rb

@@ -103,7 +103,9 @@ module Mutant
         mutator.each(value) do |mutation|
           dup = dup_node
           dup.public_send(:"#{name}=", mutation)
-          yield dup if block_given?
+          if block_given?
+            dup = yield(dup)
+          end
           emit(dup)
         end
       end
@@ -118,22 +120,31 @@ module Mutant
         emit(new_nil)
       end
 
+      # Return new Rubiinius::AST::SendWithArguments node
+      #
+      # @param [Rubnius::AST::Node] receiver
+      # @param [Symbol] name
+      # @param [Object] arguments
+      #
+      # @return [Rubinius::AST::SendWithArguments]
+      #
+      # @api private
+      #
+      def new_send_with_arguments(receiver, name, arguments)
+        new(Rubinius::AST::SendWithArguments, receiver, name, arguments)
+      end
+
       # Return AST representing send
       #
       # @param [Rubinius::AST::Node] receiver
       # @param [Symbol] name
-      # @param [Rubinius::AST::Node] arguments
       #
-      # @return [Rubnius::AST::SendWithArguments]
+      # @return [Rubnius::AST::Send]
       #
       # @api private
       #
-      def new_send(receiver, name, arguments=nil)
-        if arguments
-          new(Rubinius::AST::SendWithArguments, receiver, name, arguments)
-        else
-          new(Rubinius::AST::Send, receiver, name)
-        end
+      def new_send(receiver, name)
+        new(Rubinius::AST::Send, receiver, name)
       end
 
       # Return duplicated (unfrozen) node each call

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

@@ -1,10 +1,13 @@
 module Mutant
   class Mutator
     class Node
+
+      # Abstract base class for assignment mutators
       class Assignment < self
 
       private
 
+        # Abstract base class for variable assignments
         class Variable < self
 
           # Emit mutants
@@ -16,32 +19,36 @@ module Mutant
           def dispatch
             emit_attribute_mutations(:name) do |mutation|
               mutation.name = "#{self.class::PREFIX}#{mutation.name}".to_sym
+              mutation
             end
             emit_attribute_mutations(:value)
           end
 
+          # Mutator for local variable assignments
           class Local < self
             PREFIX = ''.freeze
             handle(Rubinius::AST::LocalVariableAssignment)
           end
 
+          # Mutator for instance variable assignments
           class Instance < self
             PREFIX = '@'.freeze
             handle(Rubinius::AST::InstanceVariableAssignment)
           end
 
+          # Mutator for class variable assignments
           class Class < self
             PREFIX = '@@'.freeze
             handle(Rubinius::AST::ClassVariableAssignment)
           end
 
+          # Mutator for global variable assignments
           class Global < self
             PREFIX = '$'.freeze
             handle(Rubinius::AST::GlobalVariableAssignment)
           end
 
         end
-
       end
     end
   end

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

@@ -22,6 +22,7 @@ module Mutant
             if array.empty?
               array << new_nil
             end
+            mutation
           end
         end
 

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

@@ -16,6 +16,7 @@ module Mutant
         def dispatch
           emit_attribute_mutations(:arguments) do |argument|
             argument.names = argument.arguments.map(&:name)
+            argument
           end
         end
       end

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

@@ -32,6 +32,7 @@ module Mutant
         def emit_required_mutations
           emit_attribute_mutations(:required) do |mutation|
             mutation.names = mutation.optional + mutation.required
+            mutation
           end
         end
       end

data/lib/mutant/mutator/node/formal_arguments_19/default_mutations.rb

@@ -22,6 +22,7 @@ module Mutant
               if mutation.defaults.names.empty?
                 mutation.defaults = nil
               end
+              mutation
             end 
           end
 

data/lib/mutant/mutator/node/{if_statement.rb → if.rb}

@@ -2,7 +2,7 @@ module Mutant
   class Mutator
     class Node
       # Mutator for Rubinius::AST::If nodes
-      class IfStatement < self
+      class If < self
 
         handle(Rubinius::AST::If)
 
@@ -16,13 +16,29 @@ module Mutant
         #
         def dispatch
           emit_attribute_mutations(:condition)
-          emit_attribute_mutations(:body) if node.body.class != Rubinius::AST::NilLiteral
-          emit_attribute_mutations(:else) if node.else.class != Rubinius::AST::NilLiteral
+          emit_attribute_mutations(:body) unless nil_literal?(:body)
+          emit_attribute_mutations(:else) unless nil_literal?(:else)
           emit_inverted_condition 
           emit_deleted_if_branch
           emit_deleted_else_branch
         end
 
+        # Test if attribute is non nil literal
+        #
+        # @param [Symbol] name
+        #
+        # @return [true]
+        #   if attribute value a nil literal
+        #
+        # @return [false]
+        #   otherwise
+        #
+        # @api private
+        #
+        def nil_literal?(name)
+          node.public_send(name).kind_of?(Rubinius::AST::NilLiteral)
+        end
+
         # Emit inverted condition
         #
         # Especially the same like swap branches but more universal as it also 
@@ -53,9 +69,8 @@ module Mutant
         # @api private
         #
         def emit_deleted_if_branch
-          body = else_branch
-          return unless body
-          emit_self(condition, else_branch, nil)
+          body = else_branch || return
+          emit_self(condition, body, nil)
         end
 
         # Return if_branch of node

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

@@ -17,6 +17,7 @@ module Mutant
           emit_attribute_mutations(:arguments) do |mutation|
             arguments = mutation.arguments
             arguments.names = arguments.required + arguments.optional
+            mutation
           end if node.arguments
         end
 

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

@@ -40,7 +40,8 @@ module Mutant
         # @api private
         #
         def nan
-          new_send(new_float(0), :/, new_float(0))
+          zero_float = new_float(0)
+          new_send_with_arguments(zero_float, :/, zero_float)
         end
 
         # Return AST representing negative infinity
@@ -50,7 +51,7 @@ module Mutant
         # @api private
         #
         def negative_infinity
-          new(Rubinius::AST::Negate, infinity)
+          new_send_with_arguments(new_float(-1), :/, new_float(0))
         end
 
         # Return AST representing infinity
@@ -60,7 +61,7 @@ module Mutant
         # @api private
         #
         def infinity
-          new_send(new_float(1), :/, new_float(0))
+          new_send_with_arguments(new_float(1), :/, new_float(0))
         end
       end
     end

data/lib/mutant/mutator/node/literal/hash.rb

@@ -59,7 +59,8 @@ module Mutant
           # @api private
           #
           def values
-            [[], [new_nil, new_nil] + dup_array]
+            nil_node = new_nil
+            [[], [nil_node, nil_node] + dup_array]
           end
 
           # Emit element presence mutations

data/lib/mutant/mutator/node/literal/range.rb

@@ -27,7 +27,8 @@ module Mutant
           # @api private
           #
           def inverse
-            new(inverse_class,node.start, node.finish)
+            node = self.node
+            new(inverse_class, node.start, node.finish)
           end
 
           # Emit range specific mutants

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

@@ -35,6 +35,8 @@ module Mutant
         handle(Rubinius::AST::OpAssignOr19)
         handle(Rubinius::AST::BlockPass19)
         handle(Rubinius::AST::OpAssign1)
+        handle(Rubinius::AST::OpAssign2)
+        handle(Rubinius::AST::SplatValue)
         handle(Rubinius::AST::ConstantAccess)
         handle(Rubinius::AST::Yield)
         handle(Rubinius::AST::Begin)

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

@@ -1,24 +1,6 @@
 module Mutant
   class Mutator
     class Node
-      # Mutator for Rubinius::AST::When nodes
-      class When < self
-
-        handle(Rubinius::AST::When)
-
-      private
-
-        # Emit mutations
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          emit_attribute_mutations(:body)
-        end
-
-      end
 
       # Mutator for Rubinius::AST::ReceiverCase nodes
       class ReceiverCase < self
@@ -57,7 +39,7 @@ module Mutant
         # @api private
         #
         def emit_when_branch_mutations
-          when_branches.each_with_index do |branch,index|
+          when_branches.each_with_index do |branch, index|
             Mutator.each(branch) do |mutant|
               branches = dup_when_branches
               branches[index]=mutant

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

@@ -1,29 +1,12 @@
 module Mutant
   class Mutator
     class Node
-      # Class for mutations where messages are send to objects
+
+      # Namespace for send mutators
       class Send < self
 
         handle(Rubinius::AST::Send)
 
-        # Test if node corresponds to "self.class"
-        #
-        # @param [Rubinius::AST::Node] node
-        #
-        # @return [true]
-        #   if node equals to self.class
-        #
-        # @return [false]
-        #   otherwise
-        #
-        # @api private
-        #
-        def self.keyword_name?(node)
-          node.kind_of?(Rubinius::AST::Send) && 
-          Mutant::KEYWORDS.include?(node.name) && 
-          node.receiver.kind_of?(Rubinius::AST::Self)
-        end
-
       private
 
         # Emit mutations
@@ -59,9 +42,7 @@ module Mutant
         # @api private
         #
         def emit_block_mutations
-          if node.block
-            emit_attribute_mutations(:block) 
-          end
+          emit_attribute_mutations(:block) if node.block
         end
 
         # Emit receiver mutations
@@ -71,11 +52,7 @@ module Mutant
         # @api private
         #
         def emit_receiver_mutations
-          util = self.class
-
-          unless to_self? or util.keyword_name?(receiver) 
-            emit_attribute_mutations(:receiver) 
-          end
+          emit_attribute_mutations(:receiver) 
         end
 
         # Emit block absence mutation
@@ -150,119 +127,14 @@ module Mutant
         # @api private
         #
         def emit_implicit_self_receiver
-          return unless to_self? 
-          return if self.class.keyword_name?(node)
+          unless to_self? and !Mutant::KEYWORDS.include?(node.name)
+            return
+          end
+
           mutant = dup_node
           mutant.privately = true
-          # TODO: Fix rubinius to allow this as an attr_accessor
-          mutant.instance_variable_set(:@vcall_style, true)
           emit(mutant)
         end
-
-        class SendWithArguments < self
-          
-          handle(Rubinius::AST::SendWithArguments)
-
-          class BinaryOperatorMethod < Node
-
-          private
-
-            # Emit mutations
-            #
-            # @return [undefined]
-            #
-            # @api private
-            #
-            def dispatch
-              emit_left_mutations
-              emit_right_mutations
-            end
-
-            # Emit left mutations
-            #
-            # @return [undefined]
-            #
-            # @api private
-            #
-            def emit_left_mutations
-              emit_attribute_mutations(:receiver)
-            end
-
-            # Emit right mutations
-            #
-            # @return [undefined]
-            #
-            # @api private
-            #
-            def emit_right_mutations
-              right = node.arguments.array.first
-              Mutator.each(right).each do |mutated|
-                dup = dup_node
-                dup.arguments.array[0] = mutated
-                emit(dup)
-              end
-            end
-
-          end
-
-        private
-
-          # Emit mutations
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def dispatch
-            super
-            emit_call_remove_mutation
-            emit_argument_mutations
-          end
-
-          # Test if message is a binary operator
-          #
-          # @return [true]
-          #   if message is a binary operator
-          #
-          # @return [false]
-          #   otherwise
-          #
-          # @api private
-          #
-          def binary_operator?
-            Mutant::BINARY_METHOD_OPERATORS.include?(node.name)
-          end
-
-          # Emit argument mutations
-          #
-          # @api private
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_argument_mutations
-            if binary_operator?
-              run(BinaryOperatorMethod)
-              return
-            end
-
-            emit_attribute_mutations(:arguments)
-          end
-
-          # Emit transfomr call mutation
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_call_remove_mutation
-            array = node.arguments.array
-            return unless array.length == 1
-            emit(array.first)
-          end
-
-        end
       end
     end
   end