mutant 0.5.18 → 0.5.19

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

@@ -20,7 +20,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_singletons
         end
 
       end # MultipleAssignment

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

@@ -17,7 +17,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_singletons
           emit_regexp_mutations
         end
 

data/lib/mutant/mutator/node/named_value/access.rb

@@ -19,7 +19,7 @@ module Mutant
           # @api private
           #
           def dispatch
-            emit_nil
+            emit_singletons
           end
 
         end # Access

data/lib/mutant/mutator/node/named_value/variable_assignment.rb

@@ -32,9 +32,9 @@ module Mutant
           # @api private
           #
           def dispatch
+            emit_singletons
             mutate_name
             emit_value_mutations if value # mlhs!
-            emit_nil
           end
 
           # Emit name mutations

data/lib/mutant/mutator/node/{loop_control.rb → next.rb}

@@ -5,14 +5,9 @@ module Mutant
     class Node
 
       # Mutator for loop control keywords
-      class LoopControl < Generic
+      class Next < Generic
 
-        INVERSE = IceNine.deep_freeze(
-          next: :break,
-          break: :next
-        )
-
-        handle(*INVERSE.keys)
+        handle(:next)
 
       private
 
@@ -24,12 +19,13 @@ module Mutant
         #
         def dispatch
           super
+          emit_singletons
           children.each_index(&method(:delete_child))
-          emit(s(INVERSE.fetch(node.type), *children))
-          emit_nil
+          emit(s(:break, *children))
         end
 
       end # Next
     end # Node
   end # Mutator
 end # Mutant
+

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

@@ -5,9 +5,11 @@ module Mutant
     class Node
 
       # OpAsgn mutator
-      class OpAsgn < Generic
+      class OpAsgn < self
 
-        handle(:op_asgn, :and_asgn)
+        handle(:op_asgn)
+
+        children :left, :operation, :right
 
       private
 
@@ -18,8 +20,11 @@ module Mutant
         # @api private
         #
         def dispatch
-          super
-          emit_nil
+          emit_singletons
+          emit_left_mutations do |mutation|
+            !mutation.type.equal?(:self)
+          end
+          emit_right_mutations
         end
 
       end # OpAsgn

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

@@ -20,8 +20,12 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
-          emit_left_mutations unless left.type.equal?(:ivasgn)
+          emit_singletons
+          unless left.type.equal?(:ivasgn)
+            emit_left_mutations do |mutation|
+              !mutation.type.equal?(:self)
+            end
+          end
           emit_right_mutations
         end
 

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

@@ -32,8 +32,8 @@ module Mutant
         #
         def mutate_captures
           return unless captures
-          Util::Array.each(captures.children, self) do |matchers|
-            next if matchers.empty? || matchers.any? { |node| node.type == :nil }
+          Util::Array::Element.each(captures.children, self) do |matchers|
+            next if matchers.any? { |node| node.type.equal?(:nil) }
             emit_captures(s(:array, *matchers))
           end
         end

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

@@ -19,11 +19,11 @@ module Mutant
         # @api private
         #
         def dispatch
+          emit_singletons
           if value
             emit(value)
             emit_value_mutations
           end
-          emit_nil
         end
 
       end # Return

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

@@ -34,7 +34,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_singletons
           case selector
           when INDEX_REFERENCE
             run(Index::Reference)

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

@@ -19,7 +19,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_singletons
           emit_expression_mutations
           emit(expression)
         end

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

@@ -21,13 +21,13 @@ module Mutant
         # @api private
         #
         def dispatch
+          emit_singletons
           emit(Z_SUPER)
           emit(EMPTY_SUPER)
           children.each_index do |index|
             mutate_child(index)
             delete_child(index)
           end
-          emit_nil
         end
 
       end # Super

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

@@ -19,8 +19,8 @@ module Mutant
         #
         def dispatch
           super
+          emit_singletons
           children.each_index(&method(:delete_child))
-          emit_nil
         end
 
       end # Yield

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

@@ -18,7 +18,7 @@ module Mutant
         # @api private
         #
         def dispatch
-          emit_nil
+          emit_singletons
         end
 
       end # ZSuper

data/lib/mutant/node_helpers.rb

@@ -24,12 +24,13 @@ module Mutant
     NEGATIVE_INFINITY =
       s(:send, s(:float, -1.0), :/, s(:float, 0.0))
 
-    RAISE             = s(:send, nil, :raise)
+    RAISE   = s(:send, nil, :raise)
 
-    N_TRUE            = s(:true)
-    N_FALSE           = s(:false)
-    N_NIL             = s(:nil)
-    N_EMPTY           = s(:empty)
+    N_TRUE  = s(:true)
+    N_FALSE = s(:false)
+    N_NIL   = s(:nil)
+    N_EMPTY = s(:empty)
+    N_SELF  = s(:self)
 
     # Build a negated boolean node
     #

data/lib/mutant/version.rb

@@ -2,5 +2,5 @@
 
 module Mutant
   # The current mutant version
-  VERSION = '0.5.18'.freeze
+  VERSION = '0.5.19'.freeze
 end # Mutant

data/meta/and.rb

@@ -3,7 +3,7 @@
 Mutant::Meta::Example.add do
   source 'true and false'
 
-  mutation 'nil'
+  singleton_mutations
   mutation 'true'
   mutation 'false'
   mutation 'true or false'

data/meta/and_asgn.rb

@@ -3,10 +3,12 @@
 Mutant::Meta::Example.add do
   source 'a &&= 1'
 
+  singleton_mutations
+
   mutation 'a__mutant__ &&= 1'
   mutation 'a &&= nil'
   mutation 'a &&= 0'
   mutation 'a &&= -1'
   mutation 'a &&= 2'
-  mutation 'nil'
+  mutation 'a &&= self'
 end

data/meta/array.rb

@@ -3,7 +3,7 @@
 Mutant::Meta::Example.add do
   source '[true]'
 
-  mutation 'nil'
+  singleton_mutations
   mutation 'true'
   mutation '[false]'
   mutation '[nil]'
@@ -13,7 +13,7 @@ end
 Mutant::Meta::Example.add do
   source '[true, false]'
 
-  mutation 'nil'
+  singleton_mutations
 
   # Mutation of each element in array
   mutation '[nil, false]'

data/meta/block.rb

@@ -3,19 +3,22 @@
 Mutant::Meta::Example.add do
   source 'foo() { a; b }'
 
+  singleton_mutations
   mutation 'foo { a }'
   mutation 'foo { b }'
   mutation 'foo {}'
   mutation 'foo { raise }'
   mutation 'foo { a; nil }'
+  mutation 'foo { a; self }'
   mutation 'foo { nil; b }'
+  mutation 'foo { self; b }'
   mutation 'foo'
-  mutation 'nil'
 end
 
 Mutant::Meta::Example.add do
   source 'foo { |a, b| }'
 
+  singleton_mutations
   mutation 'foo'
   mutation 'foo { |a, b| raise }'
   mutation 'foo { |a, b__mutant__| }'
@@ -23,13 +26,12 @@ Mutant::Meta::Example.add do
   mutation 'foo { |a| }'
   mutation 'foo { |b| }'
   mutation 'foo { || }'
-  mutation 'nil'
 end
 
 Mutant::Meta::Example.add do
   source 'foo { |(a, b), c| }'
 
-  mutation 'nil'
+  singleton_mutations
   mutation 'foo { || }'
   mutation 'foo { |a, b, c| }'
   mutation 'foo { |(a, b), c| raise }'
@@ -46,10 +48,10 @@ end
 Mutant::Meta::Example.add do
   source 'foo { |(a)| }'
 
+  singleton_mutations
   mutation 'foo { || }'
   mutation 'foo { |a| }'
   mutation 'foo { |(a)| raise }'
   mutation 'foo { |(a__mutant__)| }'
   mutation 'foo'
-  mutation 'nil'
 end

data/meta/block_pass.rb

@@ -3,6 +3,6 @@
 Mutant::Meta::Example.add do
   source 'foo(&bar)'
 
+  singleton_mutations
   mutation 'foo'
-  mutation 'nil'
 end

data/meta/blockarg.rb

@@ -3,8 +3,8 @@
 Mutant::Meta::Example.add do
   source 'foo { |&bar| }'
 
+  singleton_mutations
   mutation 'foo { |&bar| raise }'
   mutation 'foo {}'
   mutation 'foo'
-  mutation 'nil'
 end

data/meta/break.rb

@@ -3,9 +3,8 @@
 Mutant::Meta::Example.add do
   source 'break true'
 
+  singleton_mutations
   mutation 'break false'
   mutation 'break nil'
   mutation 'break'
-  mutation 'nil'
-  mutation 'next true'
 end

data/meta/case.rb

@@ -8,7 +8,7 @@ Mutant::Meta::Example.add do
     end
   RUBY
 
-  mutation 'nil'
+  singleton_mutations
 
   mutation <<-RUBY
     case
@@ -33,271 +33,192 @@ end
 
 Mutant::Meta::Example.add do
   source <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      :barbaz
+    case condition
+    when A
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
 
-  # Presence of branches
-  mutation <<-RUBY
-    case :condition
-    when :bar, :baz
-      :barbaz
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      :barbaz
-    end
-  RUBY
+  singleton_mutations
 
-  # Mutations of condition
   mutation <<-RUBY
     case nil
-    when :foo
-    when :bar, :baz
-      :barbaz
+    when A
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition__mutant__
-    when :foo
-    when :bar, :baz
-      :barbaz
+    case self
+    when A
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
 
-  # Mutations of branch bodies
   mutation <<-RUBY
-    case :condition
-    when :foo
+    case condition
+    when A
       raise
-    when :bar, :baz
-      :barbaz
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      :barbaz__mutant__
+    when B, C
+      C
     else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      nil
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      :barbaz
-    else
-      :else__mutant__
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz
-      :barbaz
-    else
-      nil
+      D
     end
   RUBY
 
-  # Mutations of when conditions
   mutation <<-RUBY
-    case :condition
-    when :foo__mutant__
-    when :bar, :baz
-      :barbaz
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
+    case condition
     when nil
-    when :bar, :baz
-      :barbaz
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar__mutant__, :baz
-      :barbaz
-    else
-      :else
-    end
-  RUBY
-  mutation <<-RUBY
-    case :condition
-    when :foo
-    when nil, :baz
-      :barbaz
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, nil
-      :barbaz
+    case condition
+    when self
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar, :baz__mutant__
-      :barbaz
+    case condition
+    when B, C
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-    when :baz
-      :barbaz
+    case condition
+    when A
+    when B, C
+      nil
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-    when :bar
-      :barbaz
+    case condition
+    when A
+    when B, C
+      self
     else
-      :else
+      D
     end
   RUBY
 
-  mutation 'nil'
-end
-
-Mutant::Meta::Example.add do
-  source <<-RUBY
-    case :condition
-    when :foo
-      :foo
+  mutation <<-RUBY
+    case condition
+    when A
+    when C
+      C
     else
-      :else
+      D
     end
   RUBY
 
-  # Presence of branches
   mutation <<-RUBY
-    case :condition
-    when :foo
-      :foo
+    case condition
+    when A
+    when nil, C
+      C
+    else
+      D
     end
   RUBY
 
-  # Mutations of condition
   mutation <<-RUBY
-    case nil
-    when :foo
-      :foo
+    case condition
+    when A
+    when self, C
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition__mutant__
-    when :foo
-      :foo
+    case condition
+    when A
+    when B
+      C
     else
-      :else
+      D
     end
   RUBY
 
-  # Mutations of branch bodies
   mutation <<-RUBY
-    case :condition
-    when :foo
-      nil
+    case condition
+    when A
+    when B, nil
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-      :foo__mutant__
+    case condition
+    when A
+    when B, self
+      C
     else
-      :else
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-      :foo
+    case condition
+    when A
     else
-      :else__mutant__
+      D
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when :foo
-      :foo
+    case condition
+    when A
+    when B, C
+      C
     else
       nil
     end
   RUBY
 
-  # Mutations of when conditions
   mutation <<-RUBY
-    case :condition
-    when :foo__mutant__
-      :foo
+    case condition
+    when A
+    when B, C
+      C
     else
-      :else
+      self
     end
   RUBY
+
   mutation <<-RUBY
-    case :condition
-    when nil
-      :foo
-    else
-      :else
+    case condition
+    when A
+    when B, C
+      C
     end
   RUBY
-
-  mutation 'nil'
 end
+
+