mutant 0.8.10 → 0.8.11

data/lib/mutant/mutator/node.rb

@@ -20,11 +20,11 @@ module Mutant
       def self.define_named_child(name, index)
         super
 
-        define_method("emit_#{name}_mutations") do |&block|
+        define_method(:"emit_#{name}_mutations") do |&block|
           mutate_child(index, &block)
         end
 
-        define_method("emit_#{name}") do |node|
+        define_method(:"emit_#{name}") do |node|
           emit_child_update(index, node)
         end
       end
@@ -54,10 +54,9 @@ module Mutant
       # @param [Fixnum] index
       #
       # @return [undefined]
-      def mutate_child(index, mutator = Mutator, &block)
+      def mutate_child(index, &block)
         block ||= TAUTOLOGY
-        child = children.at(index)
-        mutator.each(child, self) do |mutation|
+        Mutator.mutate(children.fetch(index), self).each do |mutation|
           next unless block.call(mutation)
           emit_child_update(index, mutation)
         end
@@ -117,17 +116,6 @@ module Mutant
         emit(N_NIL) unless asgn_left?
       end
 
-      # Emit values
-      #
-      # @param [Array<Object>] values
-      #
-      # @return [undefined]
-      def emit_values(values)
-        values.each do |value|
-          emit_type(value)
-        end
-      end
-
       # Parent node
       #
       # @return [Parser::AST::Node] node
@@ -163,9 +151,17 @@ module Mutant
       #
       # @return [Enumerable<Fixnum>]
       def children_indices(range)
-        range_end = range.end
-        last_index = range_end >= 0 ? range_end : children.length + range_end
-        range.begin.upto(last_index)
+        range.begin.upto(children.length + range.end)
+      end
+
+      # Emit single child mutation
+      #
+      # @return [undefined]
+      def mutate_single_child
+        children.each_with_index do |child, index|
+          mutate_child(index)
+          yield child, index unless children.one?
+        end
       end
 
     end # Node

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

@@ -2,7 +2,7 @@ module Mutant
   class Mutator
     class Node
 
-      # OpAsgn mutator
+      # AndAsgn mutator
       class AndAsgn < self
 
         handle(:and_asgn)

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

@@ -4,7 +4,7 @@ module Mutant
 
       # Mutator for required arguments
       class Argument < self
-        handle(:arg)
+        handle(:arg, :kwarg)
 
         UNDERSCORE = '_'.freeze
 
@@ -12,7 +12,7 @@ module Mutant
 
       private
 
-        # Perform dispatch
+        # Emit mutations
         #
         # @return [undefined]
         def dispatch
@@ -37,13 +37,18 @@ module Mutant
         # Mutator for optional arguments
         class Optional < self
 
-          handle(:optarg)
+          TYPE_MAP = IceNine.deep_freeze(
+            optarg:   :arg,
+            kwoptarg: :kwarg
+          )
+
+          handle(:optarg, :kwoptarg)
 
           children :name, :default
 
         private
 
-          # Perform dispatch
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch
@@ -56,7 +61,7 @@ module Mutant
           #
           # @return [undefined]
           def emit_required_mutation
-            emit(s(:arg, name))
+            emit(s(TYPE_MAP.fetch(node.type), name))
           end
 
         end # Optional

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

@@ -8,7 +8,7 @@ module Mutant
 
       private
 
-        # Perform dispatch
+        # Emit mutations
         #
         # @return [undefined]
         def dispatch
@@ -22,7 +22,7 @@ module Mutant
         # @return [undefined]
         def emit_argument_presence
           emit_type
-          Mutator::Util::Array::Presence.each(children, self) do |children|
+          Util::Array::Presence.call(children).each do |children|
             emit_type(*children)
           end
         end
@@ -32,7 +32,7 @@ module Mutant
         # @return [undefined]
         def emit_argument_mutations
           children.each_with_index do |child, index|
-            Mutator.each(child) do |mutant|
+            Mutator.mutate(child).each do |mutant|
               next if invalid_argument_replacement?(mutant, index)
               emit_child_update(index, mutant)
             end
@@ -45,11 +45,7 @@ module Mutant
         #
         # @return [Boolean]
         def invalid_argument_replacement?(mutant, index)
-          original = children.fetch(index)
-
-          n_optarg?(original) &&
-          n_arg?(mutant)      &&
-          children[0...index].any?(&method(:n_optarg?))
+          n_arg?(mutant) && children[0...index].any?(&method(:n_optarg?))
         end
 
         # Emit mlhs expansions
@@ -59,7 +55,7 @@ module Mutant
           mlhs_childs_with_index.each do |child, index|
             dup_children = children.dup
             dup_children.delete_at(index)
-            dup_children.insert(index, *child.children)
+            dup_children.insert(index, *child)
             emit_type(*dup_children)
           end
         end

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

@@ -9,28 +9,15 @@ module Mutant
 
       private
 
-        # Emit mutants
+        # Emit mutations
         #
         # @return [undefined]
         def dispatch
-          Util::Array.each(children, self, &method(:emit_child_subset))
-          children.each_with_index do |child, index|
-            mutate_child(index)
-            emit(child) unless children.eql?([child])
+          mutate_single_child do |child|
+            emit(child)
           end
         end
-
-        # Emit child subset
-        #
-        # @param [Array<Parser::AST::Node>] children
-        #
-        # @return [undefined]
-        def emit_child_subset(children)
-          return if children.length < 2
-          emit_type(*children)
-        end
-
-      end # Block
+      end # Begin
     end # Node
   end # Mutator
 end # Mutant

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

@@ -10,7 +10,7 @@ module Mutant
 
       private
 
-        # Emit mutants
+        # Emit mutations
         #
         # @return [undefined]
         def dispatch

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

@@ -13,7 +13,7 @@ module Mutant
         #
         # @return [undefined]
         def dispatch
-          super
+          super()
           emit_singletons
           children.each_index(&method(:delete_child))
         end

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

@@ -0,0 +1,21 @@
+module Mutant
+  class Mutator
+    class Node
+      # Namespace for class mutations
+      class Class < self
+        handle :class
+
+        children :klass, :parent, :body
+
+      private
+
+        # Emit mutations only for class body
+        #
+        # @return [undefined]
+        def dispatch
+          emit_body_mutations if body
+        end
+      end # Class
+    end # Node
+  end # Mutator
+end # Mutant

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

@@ -22,7 +22,7 @@ module Mutant
           emit_body(N_RAISE)
         end
 
-      end # While
+      end # ConditionalLoop
     end # Node
   end # Mutator
 end # Mutant

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

@@ -83,7 +83,7 @@ module Mutant
 
           children :subject, :name, :arguments, :body
 
-        end # Singelton
+        end # Singleton
 
       end # Define
     end # Node

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

@@ -1,7 +1,7 @@
 module Mutant
   class Mutator
     class Node
-      # Namespace for define mutations
+      # Namespace for `defined?` mutations
       class Defined < self
 
         handle(:defined?)

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

@@ -13,7 +13,7 @@ module Mutant
         #
         # @return [undefined]
         def dispatch
-          super
+          super()
           emit_singletons
         end
 

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

@@ -13,7 +13,7 @@ module Mutant
         #
         # @return [undefined]
         def dispatch
-          super
+          super()
           emit_singletons
         end
 

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

@@ -8,9 +8,9 @@ module Mutant
         # These nodes still need a dedicated mutator,
         # your contribution is that close!
         handle(
-          :csend, :ensure, :redo, :regopt, :retry, :arg_expr,
-          :kwrestarg, :kwoptarg, :kwarg, :undef, :module, :empty,
-          :alias, :for, :xstr, :back_ref, :class,
+          :ensure, :redo, :retry, :arg_expr, :blockarg,
+          :kwrestarg, :undef, :module, :empty,
+          :alias, :for, :xstr, :back_ref, :restarg,
           :sclass, :match_with_lvasgn, :while_post,
           :until_post, :preexe, :postexe, :iflipflop, :eflipflop, :kwsplat,
           :shadowarg, :rational, :complex, :__FILE__, :__LINE__

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

@@ -13,7 +13,7 @@ module Mutant
         #
         # @return [undefined]
         def dispatch
-          super
+          super()
           emit_singletons
         end
 

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

@@ -4,6 +4,15 @@ module Mutant
       # Abstract mutator for literal AST nodes
       class Literal < self
         include AbstractType
+
+      private
+
+        # Emit values
+        #
+        # @return [undefined]
+        def emit_values
+          values.each(&method(:emit_type))
+        end
       end # Literal
     end # Node
   end # Mutator

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

@@ -14,7 +14,7 @@ module Mutant
 
           handle(*MAP.keys)
 
-          # Emit mutants
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch

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

@@ -9,12 +9,12 @@ module Mutant
 
         private
 
-          # Emit mutants
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch
             emit_singletons
-            emit_values(values)
+            emit_values
           end
 
           # Values to mutate to

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

@@ -9,12 +9,12 @@ module Mutant
 
         private
 
-          # Emit mutants
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch
             emit_singletons
-            emit_values(values)
+            emit_values
             emit_special_cases
           end
 
@@ -36,10 +36,8 @@ module Mutant
           # @return [Array]
           def values
             original = children.first
-            # Work around a bug in RBX/MRI or JRUBY:
-            [0.0, 1.0, -original].delete_if do |value|
-              value.eql?(original)
-            end
+
+            [0.0, 1.0, -original]
           end
 
         end # Float

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

@@ -39,7 +39,7 @@ module Mutant
 
           private
 
-            # Perform dispatch
+            # Emit mutations
             #
             # @return [undefined]
             def dispatch

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

@@ -9,7 +9,7 @@ module Mutant
 
         private
 
-          # Emit mutants
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch

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

@@ -11,13 +11,13 @@ module Mutant
             erange: :irange
           }.freeze
 
-          children :start, :_end
+          children :lower_bound, :upper_bound
 
           handle(*MAP.keys)
 
         private
 
-          # Emit mutants
+          # Emit mutations
           #
           # @return [undefined]
           def dispatch
@@ -34,23 +34,6 @@ module Mutant
             emit(s(MAP.fetch(node.type), *children))
           end
 
-          # Emit range start mutations
-          #
-          # @return [undefined]
-          def emit_upper_bound_mutations
-            emit__end_mutations
-            emit_type(N_NAN, _end)
-          end
-
-          # Emit start mutations
-          #
-          # @return [undefined]
-          def emit_lower_bound_mutations
-            emit_start_mutations
-            emit_type(start, N_INFINITY)
-            emit_type(start, N_NAN)
-          end
-
         end # Range
       end # Literal
     end # Node