mutant 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6371f3e97aa6120ac485ee0d58ca0a2ca0c89f91
-  data.tar.gz: ea79944a38986b4d5fa4efe087a8f71e97ff42eb
+  metadata.gz: 673a7c4c1760422c883da5e4808459a53738661e
+  data.tar.gz: 08bd96b3e089053be868b81f93f6b71f85c9d99e
 SHA512:
-  metadata.gz: 67106c04fa6f31ec05b96804708370398d50fb919f6ddf4cd5e53c3ac978e1e2888b817218ad5f5cd8236ade4a7d81994cb8f0694f7f04058be235af232ff579
-  data.tar.gz: 353469ce25504bf6910f6ee2fe1786d207d48c53932ed243a89b367a3718c98d0c50ff04e23bef5df09c6d29cf7e096e9595ce42d666aa1eec670befc4cd7029
+  metadata.gz: dbd708905cb93671b7d3f714422873ca056a46c86c902a633f9b2ee948e323448434d25cc4cf547d10bad59bc90ccd101d005f2e415f67fbed885fc48c834d05
+  data.tar.gz: 308364fea4146848b5bccc79ec9b5249850a21cecc23eea59ae71887170cefc0ef781825069a2110e16fcd2b78fa8e7dade18f57b38ab19695e8cd8404da4bf4

data/.travis.yml

@@ -5,6 +5,9 @@ rvm:
   - 2.0.0
   - 2.1.0
   - rbx
+matrix:
+  allow_failures:
+    - rvm: rbx
 notifications:
   irc:
     channels:

data/Changelog.md

@@ -1,3 +1,9 @@
+# v0.3.4 2014-01-11
+
+Bugfixes:
+
+* Correctly fix crash on attribute assignments nodes: https://github.com/mbj/mutant/issues/149
+
 # v0.3.3 2014-01-11
 
 Changes:

data/config/flay.yml

@@ -1,3 +1,3 @@
 ---
 threshold: 18
-total_score: 784
+total_score: 782

data/lib/mutant.rb

@@ -1,7 +1,6 @@
 # encoding: utf-8
 
 require 'stringio'
-require 'benchmark'
 require 'set'
 require 'adamantium'
 require 'ice_nine'
@@ -13,6 +12,7 @@ require 'digest/sha1'
 require 'inflecto'
 require 'parser'
 require 'parser/current'
+require 'parser-node-list'
 require 'unparser'
 require 'ice_nine'
 require 'diff/lcs'
@@ -22,31 +22,6 @@ require 'anima'
 require 'concord'
 require 'rspec'
 
-# Monkeypatch on parser with a list of allowed nodes.
-# Will be pushed upstream once turning out to be correct.
-module Parser
-  module Meta
-    NODE_TYPES =
-      %w(
-        true false nil int float str dstr str
-        sym dsym xstr regopt regexp array splat
-        array pair kwsplat hash irange erange self
-        lvar ivar cvar gvar const defined? lvasgn
-        ivasgn cvasgn gvasgn casgn mlhs masgn op_asgn
-        op_asgn and_asgn ensure rescue arg_expr
-        or_asgn and_asgn or_asgn back_ref nth_ref
-        match_with_lvasgn match_current_line
-        module class sclass def defs undef alias args
-        cbase arg optarg restarg blockarg block_pass args def kwarg kwoptarg
-        kwrestarg send super zsuper yield block send
-        and not or if when case while until while_post
-        until_post for break next redo return resbody
-        kwbegin begin retry preexe postexe iflipflop eflipflop
-        shadowarg
-      ).map(&:to_sym).to_set.freeze
-  end # Meta
-end # Parser
-
 # Library namespace
 module Mutant
   # The empty string used within this namespace

data/lib/mutant/constants.rb

@@ -2,30 +2,36 @@
 
 module Mutant
 
+  # Return a frozen set of symbols from string enumerable
+  #
+  # @param [Enumerable<String>]
+  #
+  # @return [Set<Symbol>]
+  #
+  # @api private
+  #
+  def self.symbolset(strings)
+    strings.map(&:to_sym).to_set.freeze
+  end
+  private_class_method :symbolset
+
   # Set of nodes that cannot be on the LHS of an assignment
-  NOT_ASSIGNABLE = [
-    :int, :float, :str, :dstr, :class, :module, :self
-  ].to_set.freeze
+  NOT_ASSIGNABLE = symbolset %w(
+    int float str dstr class module self
+  )
 
   # Set of op-assign types
-  OP_ASSIGN = [
-    :or_asgn, :and_asgn, :op_asgn
-  ].to_set.freeze
-
+  OP_ASSIGN              = symbolset %w(or_asgn and_asgn op_asgn)
   # Set of node types that are not valid when emitted standalone
-  NOT_STANDALONE = [:splat, :restarg, :block_pass].to_set.freeze
+  NOT_STANDALONE         = symbolset %w( splat restarg block_pass)
+  INDEX_OPERATORS        = symbolset %w([] []=)
+  UNARY_METHOD_OPERATORS = symbolset %w(~@ +@ -@ !)
 
   # Operators ruby implementeds as methods
-  METHOD_OPERATORS = %w(
+  METHOD_OPERATORS = symbolset %w(
     <=> === []= [] <= >= == !~ != =~ <<
     >> ** * % / | ^ & < > + - ~@ +@ -@ !
-  ).map(&:to_sym).to_set.freeze
-
-  INDEX_OPERATORS = [:[], :[]=].to_set.freeze
-
-  UNARY_METHOD_OPERATORS = %w(
-    ~@ +@ -@ !
-  ).map(&:to_sym).to_set.freeze
+  )
 
   BINARY_METHOD_OPERATORS = (
     METHOD_OPERATORS - (INDEX_OPERATORS + UNARY_METHOD_OPERATORS)
@@ -39,14 +45,10 @@ module Mutant
   #
   # not - 1.8 only, mutant does not support 1.8
   #
-  NODE_BLACKLIST = %w(
-    not
-  ).map(&:to_sym).freeze
+  NODE_BLACKLIST = symbolset %w(not)
 
   # Nodes that are NOT generated by parser but used by mutant / unparser.
-  NODE_EXTRA = %w(
-    empty
-  ).map(&:to_sym).freeze
+  NODE_EXTRA = symbolset %w(empty)
 
   NODE_TYPES = ((Parser::Meta::NODE_TYPES + NODE_EXTRA) - NODE_BLACKLIST).to_set.freeze
 

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

@@ -18,7 +18,7 @@ module Mutant
 
         INDEX_REFERENCE = :[]
         INDEX_ASSIGN    = :[]=
-        ASSIGN_SUFFIX   = :'='
+        ASSIGN_SUFFIX   = '='.freeze
 
         # Base mutator for index operations
         class Index < self
@@ -81,11 +81,12 @@ module Mutant
         # @api private
         #
         def non_index_dispatch
-          if binary_operator?
+          case
+          when binary_operator?
             run(Binary)
-            return
+          else
+            normal_dispatch
           end
-          normal_dispatch
         end
 
         # Return arguments
@@ -149,6 +150,19 @@ module Mutant
           arguments.one? && BINARY_METHOD_OPERATORS.include?(selector)
         end
 
+        # Test for attribute assignment
+        #
+        # @return [true]
+        #   if node represetns and attribute assignment
+        #
+        # @return [false]
+        #
+        # @api private
+        #
+        def attribute_assignment?
+          !BINARY_OPERATORS.include?(selector) && !UNARY_OPERATORS.include?(selector) && assignment? && !mlhs?
+        end
+
         # Mutate arguments
         #
         # @return [undefined]
@@ -196,11 +210,55 @@ module Mutant
         # @api private
         #
         def emit_implicit_self
-          if receiver.type == :self and !KEYWORDS.include?(selector)
+          if receiver.type == :self && !KEYWORDS.include?(selector) && !attribute_assignment?
             emit_receiver(nil)
           end
         end
 
+        # Test for assignment
+        #
+        # FIXME: This also returns true for <= operator!
+        #
+        # @return [true]
+        #   if node represents attribute / element assignment
+        #
+        # @return [false]
+        #   otherwise
+        #
+        # @api private
+        #
+        def assignment?
+          selector.to_s[-1] == ASSIGN_SUFFIX
+        end
+
+        # Test for mlhs
+        #
+        # @return [true]
+        #   if node is within an mlhs
+        #
+        # @return [false]
+        #   otherwise
+        #
+        # @api private
+        #
+        def mlhs?
+          assignment? && !arguments?
+        end
+
+        # Test for empty arguments
+        #
+        # @return [true]
+        #   if arguments are empty
+        #
+        # @return [false]
+        #   otherwise
+        #
+        # @api private
+        #
+        def arguments?
+          arguments.any?
+        end
+
       end # Send
     end # Node
   end # Mutator

data/lib/mutant/version.rb

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

data/lib/parser-node-list.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+
+# Monkeypatch on parser with a list of allowed nodes.
+# Will be pushed upstream once turning out to be correct.
+module Parser
+  module Meta
+    NODE_TYPES =
+      %w(
+        true false nil int float str dstr str
+        sym dsym xstr regopt regexp array splat
+        array pair kwsplat hash irange erange self
+        lvar ivar cvar gvar const defined? lvasgn
+        ivasgn cvasgn gvasgn casgn mlhs masgn op_asgn
+        op_asgn and_asgn ensure rescue arg_expr
+        or_asgn and_asgn or_asgn back_ref nth_ref
+        match_with_lvasgn match_current_line
+        module class sclass def defs undef alias args
+        cbase arg optarg restarg blockarg block_pass args def kwarg kwoptarg
+        kwrestarg send super zsuper yield block send
+        and not or if when case while until while_post
+        until_post for break next redo return resbody
+        kwbegin begin retry preexe postexe iflipflop eflipflop
+        shadowarg
+      ).map(&:to_sym).to_set.freeze
+  end # Meta
+end # Parser

data/mutant.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9.3'
 
-  gem.add_runtime_dependency('parser',              '~> 2.1.0')
+  gem.add_runtime_dependency('parser',              '~> 2.1.4')
   gem.add_runtime_dependency('procto',              '~> 0.0.2')
   gem.add_runtime_dependency('abstract_type',       '~> 0.0.7')
   gem.add_runtime_dependency('unparser',            '~> 0.1.8')

data/spec/unit/mutant/mutator/node/send_spec.rb

@@ -56,20 +56,40 @@ describe Mutant::Mutator, 'send' do
   end
 
   context 'attribute assign' do
-    let(:source) { 'foo.bar=baz' }
 
-    let(:mutations) do
-      mutations = []
-      mutations << 'foo'
-      mutations << 'nil'
-      mutations << 'foo.bar=nil'
-      mutations << 'foo.bar'
-      mutations << 'baz'
-      # This one could probably be removed
-      mutations << 'nil.bar=baz'
+    context 'to self' do
+      let(:source) { 'self.bar=baz' }
+
+      let(:mutations) do
+        mutations = []
+        mutations << 'nil'
+        mutations << 'self.bar=nil'
+        mutations << 'self'
+        mutations << 'self.bar'
+        mutations << 'baz'
+        # This one could probably be removed
+        mutations << 'nil.bar=baz'
+      end
+
+      it_should_behave_like 'a mutator'
     end
 
-    it_should_behave_like 'a mutator'
+    context 'to other object' do
+      let(:source) { 'foo.bar=baz' }
+
+      let(:mutations) do
+        mutations = []
+        mutations << 'foo'
+        mutations << 'nil'
+        mutations << 'foo.bar=nil'
+        mutations << 'foo.bar'
+        mutations << 'baz'
+        # This one could probably be removed
+        mutations << 'nil.bar=baz'
+      end
+
+      it_should_behave_like 'a mutator'
+    end
   end
 
   context 'index assign' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mutant
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Markus Schirp
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: procto
   requirement: !ruby/object:Gem::Requirement
@@ -344,6 +344,7 @@ files:
 - lib/mutant/subject/method/singleton.rb
 - lib/mutant/version.rb
 - lib/mutant/zombifier.rb
+- lib/parser-node-list.rb
 - mutant.gemspec
 - spec/integration/mutant/rspec_spec.rb
 - spec/integration/mutant/test_mutator_handles_types_spec.rb