parser 2.1.9 → 2.2.0.pre.1

data/lib/parser/runner.rb

@@ -67,16 +67,21 @@ module Parser
         @parser_class = Parser::Ruby19
       end
 
-      @slop.on '20', 'Parse as Ruby 2.0.0 would' do
+      @slop.on '20', 'Parse as Ruby 2.0 would' do
         require 'parser/ruby20'
         @parser_class = Parser::Ruby20
       end
 
-      @slop.on '21', 'Parse as Ruby 2.1.0 would' do
+      @slop.on '21', 'Parse as Ruby 2.1 would' do
         require 'parser/ruby21'
         @parser_class = Parser::Ruby21
       end
 
+      @slop.on '22', 'Parse as Ruby 2.2 would' do
+        require 'parser/ruby22'
+        @parser_class = Parser::Ruby22
+      end
+
       @slop.on 'w',  'warnings',  'Enable warnings'
 
       @slop.on 'B',  'benchmark', 'Benchmark the processor'
@@ -140,7 +145,9 @@ module Parser
 
     def process_fragments
       @fragments.each_with_index do |fragment, index|
-        fragment = fragment.dup.force_encoding(@parser.default_encoding)
+        if fragment.respond_to? :force_encoding
+          fragment = fragment.dup.force_encoding(@parser.default_encoding)
+        end
 
         buffer = Source::Buffer.new("(fragment:#{index})")
         buffer.source = fragment
@@ -152,7 +159,9 @@ module Parser
     def process_files
       @files.each do |filename|
         source = File.read(filename)
-        source.force_encoding(@parser.default_encoding)
+        if source.respond_to? :force_encoding
+          source.force_encoding(@parser.default_encoding)
+        end
 
         buffer = Parser::Source::Buffer.new(filename)
 

data/lib/parser/source/rewriter.rb

@@ -44,7 +44,7 @@ module Parser
       #
       # @param [Range] range
       # @return [Rewriter] self
-      # @raise [RuntimeError] when clobbering is detected
+      # @raise [ClobberingError] when clobbering is detected
       #
       def remove(range)
         append Rewriter::Action.new(range, '')
@@ -56,7 +56,7 @@ module Parser
       # @param [Range] range
       # @param [String] content
       # @return [Rewriter] self
-      # @raise [RuntimeError] when clobbering is detected
+      # @raise [ClobberingError] when clobbering is detected
       #
       def insert_before(range, content)
         append Rewriter::Action.new(range.begin, content)
@@ -68,7 +68,7 @@ module Parser
       # @param [Range] range
       # @param [String] content
       # @return [Rewriter] self
-      # @raise [RuntimeError] when clobbering is detected
+      # @raise [ClobberingError] when clobbering is detected
       #
       def insert_after(range, content)
         append Rewriter::Action.new(range.end, content)
@@ -80,7 +80,7 @@ module Parser
       # @param [Range] range
       # @param [String] content
       # @return [Rewriter] self
-      # @raise [RuntimeError] when clobbering is detected
+      # @raise [ClobberingError] when clobbering is detected
       #
       def replace(range, content)
         append Rewriter::Action.new(range, content)
@@ -93,6 +93,10 @@ module Parser
       # @return [String]
       #
       def process
+        if in_transaction?
+          raise "Do not call #{self.class}##{__method__} inside a transaction"
+        end
+
         adjustment = 0
         source     = @source_buffer.source.dup
 
@@ -112,6 +116,46 @@ module Parser
         source
       end
 
+      ##
+      # Provides a protected block where a sequence of multiple rewrite actions
+      # are handled atomic. If any of the action failed by clobbering,
+      # all the actions are rolled back.
+      #
+      # @example
+      #  begin
+      #    rewriter.transaction do
+      #      rewriter.insert_before(range_of_something, '(')
+      #      rewriter.insert_after(range_of_something, ')')
+      #    end
+      #  rescue Parser::ClobberingError
+      #  end
+      #
+      # @raise [RuntimeError] when no block is passed
+      # @raise [RuntimeError] when already in a transaction
+      #
+      def transaction
+        unless block_given?
+          raise "#{self.class}##{__method__} requires block"
+        end
+
+        if in_transaction?
+          raise 'Nested transaction is not supported'
+        end
+
+        @pending_queue = @queue.dup
+        @pending_clobber = @clobber
+
+        yield
+
+        @queue = @pending_queue
+        @clobber = @pending_clobber
+
+        self
+      ensure
+        @pending_queue = nil
+        @pending_clobber = nil
+      end
+
       private
 
       def append(action)
@@ -130,27 +174,47 @@ module Parser
                                       clobber_action.range)
           @diagnostics.process(diagnostic)
 
-          raise RuntimeError, "Parser::Source::Rewriter detected clobbering"
+          raise ClobberingError, "Parser::Source::Rewriter detected clobbering"
         else
           clobber(action.range)
 
-          @queue << action
+          active_queue << action
         end
 
         self
       end
 
       def clobber(range)
-        @clobber |= (2 ** range.size - 1) << range.begin_pos
+        self.active_clobber = active_clobber | (2 ** range.size - 1) << range.begin_pos
       end
 
       def clobbered?(range)
-        if @clobber & ((2 ** range.size - 1) << range.begin_pos) != 0
-          @queue.find do |action|
+        if active_clobber & ((2 ** range.size - 1) << range.begin_pos) != 0
+          active_queue.find do |action|
             action.range.to_a & range.to_a
           end
         end
       end
+
+      def in_transaction?
+        !@pending_queue.nil?
+      end
+
+      def active_queue
+        @pending_queue || @queue
+      end
+
+      def active_clobber
+        @pending_clobber || @clobber
+      end
+
+      def active_clobber=(value)
+        if @pending_clobber
+          @pending_clobber = value
+        else
+          @clobber = value
+        end
+      end
     end
 
   end

data/lib/parser/version.rb

@@ -1,3 +1,3 @@
 module Parser
-  VERSION = '2.1.9'
+  VERSION = '2.2.0.pre.1'
 end

data/parser.gemspec

@@ -21,14 +21,14 @@ Gem::Specification.new do |spec|
                           lib/parser/ruby21.rb
                        )
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ['lib']
 
   spec.add_dependency             'ast',       ['>= 1.1', '< 3.0']
   spec.add_dependency             'slop',      ['~> 3.4', '>= 3.4.5']
 
   spec.add_development_dependency 'bundler',   '~> 1.2'
-  spec.add_development_dependency 'rake',      '~> 0.9'
+  spec.add_development_dependency 'rake',      ['>= 0.9', '< 11.0']
   spec.add_development_dependency 'racc',      '= 1.4.9' # update to 1.4.11 when it's done
   spec.add_development_dependency 'cliver',    '~> 0.3.0'
 

data/test/parse_helper.rb

@@ -7,9 +7,9 @@ module ParseHelper
     ALL_VERSIONS = %w(1.8)
   else
     require 'parser/all'
-    require 'parser/ruby21'
+    require 'parser/ruby22'
 
-    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1)
+    ALL_VERSIONS = %w(1.8 1.9 2.0 2.1 2.2)
   end
 
   def setup
@@ -24,6 +24,7 @@ module ParseHelper
     when '1.9' then parser = Parser::Ruby19.new
     when '2.0' then parser = Parser::Ruby20.new
     when '2.1' then parser = Parser::Ruby21.new
+    when '2.2' then parser = Parser::Ruby22.new
     else raise "Unrecognized Ruby version #{version}"
     end
 

data/test/test_current.rb

@@ -10,8 +10,10 @@ class TestCurrent < Minitest::Test
       assert_equal Parser::Ruby19, Parser::CurrentRuby
     when '2.0.0'
       assert_equal Parser::Ruby20, Parser::CurrentRuby
-    when '2.1.0', '2.1.1'
+    when '2.1.0', '2.1.1', '2.1.2'
       assert_equal Parser::Ruby21, Parser::CurrentRuby
+    when '2.2.0'
+      assert_equal Parser::Ruby22, Parser::CurrentRuby
     else
       flunk "Update test_parser_current for #{RUBY_VERSION}"
     end

data/test/test_parser.rb

@@ -1769,6 +1769,25 @@ class TestParser < Minitest::Test
         |      ~~~~~~ expression (args.blockarg)})
   end
 
+  def test_arg_scope
+    # [ruby-core:61299] [Bug #9593]
+    assert_parses(
+      s(:def, :f,
+        s(:args, s(:optarg, :var, s(:defined?, s(:lvar, :var)))),
+        s(:lvar, :var)),
+      %q{def f(var = defined?(var)) var end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0))
+
+    assert_parses(
+      s(:def, :f,
+        s(:args, s(:kwoptarg, :var, s(:defined?, s(:lvar, :var)))),
+        s(:lvar, :var)),
+      %q{def f(var: defined?(var)) var end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0))
+  end
+
   def assert_parses_args(ast, code, versions=ALL_VERSIONS)
     assert_parses(
       s(:def, :f, ast, nil),
@@ -4765,6 +4784,34 @@ class TestParser < Minitest::Test
       %q{desc "foo" do end})
   end
 
+  def test_bug_do_block_in_call_args
+    # [ruby-core:59342] [Bug #9308]
+    assert_parses(
+      s(:send, nil, :bar,
+        s(:def, :foo,
+          s(:args),
+          s(:block,
+            s(:send, s(:self), :each),
+            s(:args),
+            nil))),
+      %q{bar def foo; self.each do end end},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+  end
+
+  def test_bug_do_block_in_cmdarg
+    # [ruby-core:61950] [Bug #9726]
+    assert_parses(
+      s(:send, nil, :tap,
+        s(:begin,
+          s(:block,
+            s(:send, nil, :proc),
+            s(:args), nil))),
+      %q{tap (proc do end)},
+      %q{},
+      ALL_VERSIONS - %w(1.8 1.9 2.0 2.1))
+  end
+
   def test_bug_interp_single
     assert_parses(
       s(:dstr, s(:begin, s(:int, 1))),

data/test/test_source_rewriter.rb

@@ -74,7 +74,7 @@ class TestSourceRewriter < Minitest::Test
       diagnostics << diag
     end
 
-    assert_raises RuntimeError, /clobber/ do
+    assert_raises Parser::ClobberingError do
       @rewriter.
         replace(range(3, 1), '---').
         remove(range(3, 1))
@@ -92,4 +92,88 @@ class TestSourceRewriter < Minitest::Test
                  diagnostics.last.message
     assert_equal range(3, 1), diagnostics.last.location
   end
+
+  def test_clobbering_error_backward_compatibility
+    silence_diagnostics
+
+    rescued = false
+
+    # We use begin..rescue..end here rather than #assert_raises
+    # since #assert_raises expects exact error class.
+    begin
+      @rewriter.
+        replace(range(3, 1), '---').
+        remove(range(3, 1))
+    rescue RuntimeError => error
+      rescued = true if error.message.include?('clobber')
+    end
+
+    assert rescued
+  end
+
+  def test_transaction_returns_self
+    assert_equal @rewriter, @rewriter.transaction {}
+  end
+
+  def test_transaction_commit
+    silence_diagnostics
+
+    # Original: 'foo bar baz'
+
+    # Rewrite as 'foo BAR baz'
+    @rewriter.replace(range(4, 3), 'BAR')
+
+    # Rewrite as '( bar )'
+    @rewriter.transaction do
+      @rewriter.replace(range(0, 3), '(')
+      @rewriter.replace(range(8, 3), ')')
+    end
+
+    @rewriter.replace(range(3, 1), '_')
+    @rewriter.replace(range(7, 1), '_')
+
+    assert_equal '(_BAR_)', @rewriter.process
+  end
+
+  def test_transaction_rollback
+    silence_diagnostics
+
+    # Original: 'foo bar baz'
+
+    # Rewrite as 'foo bar BAZ'
+    @rewriter.replace(range(8, 3), 'BAZ')
+
+    assert_raises Parser::ClobberingError do
+      # Trying to rewrite as '( bar )', but it fails
+      @rewriter.transaction do
+        @rewriter.replace(range(0, 3), '(')
+        @rewriter.replace(range(8, 3), ')')
+      end
+    end
+
+    @rewriter.replace(range(0, 3), 'FOO')
+
+    assert_equal 'FOO bar BAZ', @rewriter.process
+  end
+
+  def test_nested_transaction_raises_error
+    assert_raises RuntimeError, /nested/ do
+      @rewriter.transaction do
+        @rewriter.transaction do
+        end
+      end
+    end
+  end
+
+  def test_process_in_transaction_raises_error
+    assert_raises RuntimeError, /transaction/ do
+      @rewriter.transaction do
+        @rewriter.process
+      end
+    end
+  end
+
+  def silence_diagnostics
+    @rewriter.diagnostics.consumer = proc {}
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.1.9
+  version: 2.2.0.pre.1
 platform: ruby
 authors:
 - Peter Zotov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-21 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -68,16 +68,22 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: racc
   requirement: !ruby/object:Gem::Requirement
@@ -242,7 +248,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -265,6 +270,7 @@ files:
 - lib/parser/ast/processor.rb
 - lib/parser/base.rb
 - lib/parser/builders/default.rb
+- lib/parser/clobbering_error.rb
 - lib/parser/compatibility/ruby1_8.rb
 - lib/parser/compatibility/ruby1_9.rb
 - lib/parser/current.rb
@@ -286,6 +292,7 @@ files:
 - lib/parser/ruby20.y
 - lib/parser/ruby21.rb
 - lib/parser/ruby21.y
+- lib/parser/ruby22.y
 - lib/parser/runner.rb
 - lib/parser/runner/ruby_parse.rb
 - lib/parser/runner/ruby_rewrite.rb
@@ -346,9 +353,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2