parser 2.7.1.4 → 3.0.1.1

data/lib/parser/runner.rb

@@ -37,7 +37,7 @@ module Parser
 
     private
 
-    LEGACY_MODES = %i[lambda procarg0 encoding index arg_inside_procarg0 forward_arg].freeze
+    LEGACY_MODES = %i[lambda procarg0 encoding index arg_inside_procarg0 forward_arg kwargs match_pattern].freeze
 
     def runner_name
       raise NotImplementedError, "implement #{self.class}##{__callee__}"
@@ -113,9 +113,14 @@ module Parser
         @parser_class = Parser::Ruby27
       end
 
-      opts.on '--28', 'Parse as Ruby 2.8 would' do
-        require 'parser/ruby28'
-        @parser_class = Parser::Ruby28
+      opts.on '--30', 'Parse as Ruby 3.0 would' do
+        require 'parser/ruby30'
+        @parser_class = Parser::Ruby30
+      end
+
+      opts.on '--31', 'Parse as Ruby 3.1 would' do
+        require 'parser/ruby31'
+        @parser_class = Parser::Ruby31
       end
 
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do

data/lib/parser/source/buffer.rb

@@ -114,8 +114,7 @@ module Parser
         @slice_source = nil
 
         # Cache for fast lookup
-        @line_for_position   = {}
-        @column_for_position = {}
+        @line_index_for_position = {}
 
         self.source = source if source
       end
@@ -207,9 +206,10 @@ module Parser
       # @return [[Integer, Integer]] `[line, column]`
       #
       def decompose_position(position)
-        line_no, line_begin = line_for(position)
+        line_index = line_index_for_position(position)
+        line_begin = line_begins[line_index]
 
-        [ @first_line + line_no, position - line_begin ]
+        [ @first_line + line_index , position - line_begin ]
       end
 
       ##
@@ -220,10 +220,7 @@ module Parser
       # @api private
       #
       def line_for_position(position)
-        @line_for_position[position] ||= begin
-          line_no, _ = line_for(position)
-          @first_line + line_no
-        end
+        line_index_for_position(position) + @first_line
       end
 
       ##
@@ -234,10 +231,8 @@ module Parser
       # @api private
       #
       def column_for_position(position)
-        @column_for_position[position] ||= begin
-          _, line_begin = line_for(position)
-          position - line_begin
-        end
+        line_index = line_index_for_position(position)
+        position - line_begins[line_index]
       end
 
       ##
@@ -278,15 +273,13 @@ module Parser
       # @raise  [IndexError] if `lineno` is out of bounds
       #
       def line_range(lineno)
-        index = lineno - @first_line + 1
-        if index <= 0 || index > line_begins.size
+        index = lineno - @first_line
+        if index < 0 || index + 1 >= line_begins.size
           raise IndexError, 'Parser::Source::Buffer: range for line ' \
             "#{lineno} requested, valid line numbers are #{@first_line}.." \
-            "#{@first_line + line_begins.size - 1}"
-        elsif index == line_begins.size
-          Range.new(self, line_begins[-index][1], @source.size)
+            "#{@first_line + line_begins.size - 2}"
         else
-          Range.new(self, line_begins[-index][1], line_begins[-index - 1][1] - 1)
+          Range.new(self, line_begins[index], line_begins[index + 1] - 1)
         end
       end
 
@@ -303,27 +296,57 @@ module Parser
       # @return [Integer]
       #
       def last_line
-        line_begins.size + @first_line - 1
+        line_begins.size + @first_line - 2
+      end
+
+      # :nodoc:
+      def freeze
+        source_lines; line_begins; source_range # build cache
+        super
+      end
+
+      # :nodoc:
+      def inspect
+        "#<#{self.class} #{name}>"
       end
 
       private
 
+      # @returns [0, line_begin_of_line_1, ..., source.size + 1]
       def line_begins
-        unless @line_begins
-          @line_begins, index = [ [ 0, 0 ] ], 0
-
+        @line_begins ||= begin
+          begins = [0]
+          index = 0
           while index = @source.index("\n".freeze, index)
             index += 1
-            @line_begins.unshift [ @line_begins.length, index ]
+            begins << index
           end
+          begins << @source.size + 1
+          begins
         end
+      end
 
-        @line_begins
+      # @returns 0-based line index of position
+      def line_index_for_position(position)
+        @line_index_for_position[position] || begin
+          index = bsearch(line_begins, position) - 1
+          @line_index_for_position[position] = index unless @line_index_for_position.frozen?
+          index
+        end
       end
 
-      def line_for(position)
-        line_begins.bsearch do |line, line_begin|
-          line_begin <= position
+      if Array.method_defined?(:bsearch_index) # RUBY_VERSION >= 2.3
+        def bsearch(line_begins, position)
+          line_begins.bsearch_index do |line_begin|
+            position < line_begin
+          end || line_begins.size - 1 # || only for out of bound values
+        end
+      else
+        def bsearch(line_begins, position)
+          @line_range ||= 0...line_begins.size
+          @line_range.bsearch do |i|
+            position < line_begins[i]
+          end || line_begins.size - 1 # || only for out of bound values
         end
       end
     end

data/lib/parser/source/comment.rb

@@ -10,7 +10,7 @@ module Parser
     #  @return [String]
     #
     # @!attribute [r] location
-    #  @return [Parser::Source::Map]
+    #  @return [Parser::Source::Range]
     #
     # @api public
     #
@@ -48,6 +48,19 @@ module Parser
         associator.associate_locations
       end
 
+      ##
+      # Associate `comments` with `ast` nodes using identity.
+      #
+      # @param [Parser::AST::Node] ast
+      # @param [Array<Comment>]    comments
+      # @return [Hash<Parser::Source::Node, Array<Comment>>]
+      # @see Parser::Source::Comment::Associator#associate_by_identity
+      #
+      def self.associate_by_identity(ast, comments)
+        associator = Associator.new(ast, comments)
+        associator.associate_by_identity
+      end
+
       ##
       # @param [Parser::Source::Range] range
       #

data/lib/parser/source/comment/associator.rb

@@ -84,12 +84,24 @@ module Parser
       #
       # Note that {associate} produces unexpected result for nodes which are
       # equal but have distinct locations; comments for these nodes are merged.
+      # You may prefer using {associate_by_identity} or {associate_locations}.
       #
       # @return [Hash<Parser::AST::Node, Array<Parser::Source::Comment>>]
       # @deprecated Use {associate_locations}.
       #
       def associate
-        @map_using_locations = false
+        @map_using = :eql
+        do_associate
+      end
+
+      ##
+      # Same as {associate}, but compares by identity, thus producing an unambiguous
+      # result even in presence of equal nodes.
+      #
+      # @return [Hash<Parser::Source::Node, Array<Parser::Source::Comment>>]
+      #
+      def associate_locations
+        @map_using = :location
         do_associate
       end
 
@@ -100,14 +112,14 @@ module Parser
       #
       # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
       #
-      def associate_locations
-        @map_using_locations = true
+      def associate_by_identity
+        @map_using = :identity
         do_associate
       end
 
       private
 
-      POSTFIX_TYPES = Set[:if, :while, :while_post, :until, :until_post].freeze
+      POSTFIX_TYPES = Set[:if, :while, :while_post, :until, :until_post, :masgn].freeze
       def children_in_source_order(node)
         if POSTFIX_TYPES.include?(node.type)
           # All these types have either nodes with expressions, or `nil`
@@ -122,6 +134,7 @@ module Parser
 
       def do_associate
         @mapping     = Hash.new { |h, k| h[k] = [] }
+        @mapping.compare_by_identity if @map_using == :identity
         @comment_num = -1
         advance_comment
 
@@ -191,7 +204,7 @@ module Parser
       end
 
       def associate_and_advance_comment(node)
-        key = @map_using_locations ? node.location : node
+        key = @map_using == :location ? node.location : node
         @mapping[key] << @current_comment
         advance_comment
       end

data/lib/parser/source/map/{endless_definition.rb → method_definition.rb}

@@ -3,19 +3,21 @@
 module Parser
   module Source
 
-    class Map::EndlessDefinition < Map
+    class Map::MethodDefinition < Map
       attr_reader :keyword
       attr_reader :operator
       attr_reader :name
+      attr_reader :end
       attr_reader :assignment
 
-      def initialize(keyword_l, operator_l, name_l, assignment_l, body_l)
+      def initialize(keyword_l, operator_l, name_l, end_l, assignment_l, body_l)
         @keyword  = keyword_l
         @operator = operator_l
         @name     = name_l
+        @end      = end_l
         @assignment = assignment_l
 
-        super(@keyword.join(body_l))
+        super(@keyword.join(end_l || body_l))
       end
     end
 

data/lib/parser/source/range.rb

@@ -112,11 +112,11 @@ module Parser
       # @raise RangeError
       #
       def column_range
-        if self.begin.line != self.end.line
+        if line != last_line
           raise RangeError, "#{self.inspect} spans more than one line"
         end
 
-        self.begin.column...self.end.column
+        column...last_column
       end
 
       ##

data/lib/parser/source/tree_rewriter.rb

@@ -330,6 +330,11 @@ module Parser
         @in_transaction
       end
 
+      # :nodoc:
+      def inspect
+        "#<#{self.class} #{source_buffer.name}: #{action_summary}>"
+      end
+
       ##
       # @api private
       # @deprecated Use insert_after or wrap
@@ -361,6 +366,28 @@ module Parser
 
       private
 
+      def action_summary
+        replacements = as_replacements
+        case replacements.size
+        when 0 then return 'empty'
+        when 1..3 then #ok
+        else
+          replacements = replacements.first(3)
+          suffix = '…'
+        end
+        parts = replacements.map do |(range, str)|
+          if str.empty? # is this a deletion?
+            "-#{range.to_range}"
+          elsif range.size == 0 # is this an insertion?
+            "+#{str.inspect}@#{range.begin_pos}"
+          else # it is a replacement
+            "^#{str.inspect}@#{range.to_range}"
+          end
+        end
+        parts << suffix if suffix
+        parts.join(', ')
+      end
+
       ACTIONS = %i[accept warn raise].freeze
       def check_policy_validity
         invalid = @policy.values - ACTIONS

data/lib/parser/static_environment.rb

@@ -51,6 +51,10 @@ module Parser
     def declared_forward_args?
       declared?(FORWARD_ARGS)
     end
+
+    def empty?
+      @stack.empty?
+    end
   end
 
 end

data/lib/parser/variables_stack.rb

@@ -8,6 +8,10 @@ module Parser
       push
     end
 
+    def empty?
+      @stack.empty?
+    end
+
     def push
       @stack << Set.new
     end

data/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '2.7.1.4'
+  VERSION = '3.0.1.1'
 end

data/parser.gemspec

@@ -20,24 +20,8 @@ Gem::Specification.new do |spec|
     'source_code_uri' => "https://github.com/whitequark/parser/tree/v#{spec.version}"
   }
 
-  spec.files         = `git ls-files`.split + %w(
-                          lib/parser/lexer.rb
-                          lib/parser/ruby18.rb
-                          lib/parser/ruby19.rb
-                          lib/parser/ruby20.rb
-                          lib/parser/ruby21.rb
-                          lib/parser/ruby22.rb
-                          lib/parser/ruby23.rb
-                          lib/parser/ruby24.rb
-                          lib/parser/ruby25.rb
-                          lib/parser/ruby26.rb
-                          lib/parser/ruby27.rb
-                          lib/parser/ruby28.rb
-                          lib/parser/macruby.rb
-                          lib/parser/rubymotion.rb
-                       )
+  spec.files         = Dir['bin/*', 'lib/**/*.rb', 'parser.gemspec', 'LICENSE.txt']
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 2.7.1.4
+  version: 3.0.1.1
 platform: ruby
 authors:
 - whitequark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-19 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -165,23 +165,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".yardopts"
-- CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE.txt
-- README.md
-- Rakefile
 - bin/ruby-parse
 - bin/ruby-rewrite
-- ci/run_rubocop_specs
-- doc/AST_FORMAT.md
-- doc/CUSTOMIZATION.md
-- doc/INTERNALS.md
-- doc/css/.gitkeep
-- doc/css/common.css
 - lib/gauntlet_parser.rb
 - lib/parser.rb
 - lib/parser/all.rb
@@ -198,41 +184,29 @@ files:
 - lib/parser/diagnostic.rb
 - lib/parser/diagnostic/engine.rb
 - lib/parser/lexer.rb
-- lib/parser/lexer.rl
 - lib/parser/lexer/dedenter.rb
 - lib/parser/lexer/explanation.rb
 - lib/parser/lexer/literal.rb
 - lib/parser/lexer/stack_state.rb
 - lib/parser/macruby.rb
-- lib/parser/macruby.y
 - lib/parser/max_numparam_stack.rb
 - lib/parser/messages.rb
 - lib/parser/meta.rb
 - lib/parser/rewriter.rb
 - lib/parser/ruby18.rb
-- lib/parser/ruby18.y
 - lib/parser/ruby19.rb
-- lib/parser/ruby19.y
 - lib/parser/ruby20.rb
-- lib/parser/ruby20.y
 - lib/parser/ruby21.rb
-- lib/parser/ruby21.y
 - lib/parser/ruby22.rb
-- lib/parser/ruby22.y
 - lib/parser/ruby23.rb
-- lib/parser/ruby23.y
 - lib/parser/ruby24.rb
-- lib/parser/ruby24.y
 - lib/parser/ruby25.rb
-- lib/parser/ruby25.y
 - lib/parser/ruby26.rb
-- lib/parser/ruby26.y
 - lib/parser/ruby27.rb
-- lib/parser/ruby27.y
 - lib/parser/ruby28.rb
-- lib/parser/ruby28.y
+- lib/parser/ruby30.rb
+- lib/parser/ruby31.rb
 - lib/parser/rubymotion.rb
-- lib/parser/rubymotion.y
 - lib/parser/runner.rb
 - lib/parser/runner/ruby_parse.rb
 - lib/parser/runner/ruby_rewrite.rb
@@ -244,11 +218,11 @@ files:
 - lib/parser/source/map/condition.rb
 - lib/parser/source/map/constant.rb
 - lib/parser/source/map/definition.rb
-- lib/parser/source/map/endless_definition.rb
 - lib/parser/source/map/for.rb
 - lib/parser/source/map/heredoc.rb
 - lib/parser/source/map/index.rb
 - lib/parser/source/map/keyword.rb
+- lib/parser/source/map/method_definition.rb
 - lib/parser/source/map/objc_kwarg.rb
 - lib/parser/source/map/operator.rb
 - lib/parser/source/map/rescue_body.rb
@@ -266,45 +240,14 @@ files:
 - lib/parser/variables_stack.rb
 - lib/parser/version.rb
 - parser.gemspec
-- test/bug_163/fixtures/input.rb
-- test/bug_163/fixtures/output.rb
-- test/bug_163/rewriter.rb
-- test/helper.rb
-- test/parse_helper.rb
-- test/racc_coverage_helper.rb
-- test/test_ast_processor.rb
-- test/test_base.rb
-- test/test_current.rb
-- test/test_diagnostic.rb
-- test/test_diagnostic_engine.rb
-- test/test_encoding.rb
-- test/test_lexer.rb
-- test/test_lexer_stack_state.rb
-- test/test_meta.rb
-- test/test_parse_helper.rb
-- test/test_parser.rb
-- test/test_runner_parse.rb
-- test/test_runner_rewrite.rb
-- test/test_source_buffer.rb
-- test/test_source_comment.rb
-- test/test_source_comment_associator.rb
-- test/test_source_map.rb
-- test/test_source_range.rb
-- test/test_source_rewriter.rb
-- test/test_source_rewriter_action.rb
-- test/test_source_tree_rewriter.rb
-- test/test_static_environment.rb
-- test/using_tree_rewriter/fixtures/input.rb
-- test/using_tree_rewriter/fixtures/output.rb
-- test/using_tree_rewriter/using_tree_rewriter.rb
 homepage: https://github.com/whitequark/parser
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v2.7.1.4/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/2.7.1.4
-  source_code_uri: https://github.com/whitequark/parser/tree/v2.7.1.4
+  changelog_uri: https://github.com/whitequark/parser/blob/v3.0.1.1/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/3.0.1.1
+  source_code_uri: https://github.com/whitequark/parser/tree/v3.0.1.1
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -324,35 +267,4 @@ rubygems_version: 3.0.6
 signing_key:
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.
-test_files:
-- test/bug_163/fixtures/input.rb
-- test/bug_163/fixtures/output.rb
-- test/bug_163/rewriter.rb
-- test/helper.rb
-- test/parse_helper.rb
-- test/racc_coverage_helper.rb
-- test/test_ast_processor.rb
-- test/test_base.rb
-- test/test_current.rb
-- test/test_diagnostic.rb
-- test/test_diagnostic_engine.rb
-- test/test_encoding.rb
-- test/test_lexer.rb
-- test/test_lexer_stack_state.rb
-- test/test_meta.rb
-- test/test_parse_helper.rb
-- test/test_parser.rb
-- test/test_runner_parse.rb
-- test/test_runner_rewrite.rb
-- test/test_source_buffer.rb
-- test/test_source_comment.rb
-- test/test_source_comment_associator.rb
-- test/test_source_map.rb
-- test/test_source_range.rb
-- test/test_source_rewriter.rb
-- test/test_source_rewriter_action.rb
-- test/test_source_tree_rewriter.rb
-- test/test_static_environment.rb
-- test/using_tree_rewriter/fixtures/input.rb
-- test/using_tree_rewriter/fixtures/output.rb
-- test/using_tree_rewriter/using_tree_rewriter.rb
+test_files: []