parser 3.0.0.0 → 3.0.2.0

data/lib/parser/runner.rb

@@ -118,6 +118,11 @@ module Parser
         @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
         require 'parser/macruby'
         @parser_class = Parser::MacRuby

data/lib/parser/source/buffer.rb

@@ -305,6 +305,11 @@ module Parser
         super
       end
 
+      # :nodoc:
+      def inspect
+        "#<#{self.class} #{name}>"
+      end
+
       private
 
       # @returns [0, line_begin_of_line_1, ..., source.size + 1]

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,8 +112,8 @@ 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
 
@@ -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/comment.rb

@@ -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/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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 3.0.0.0
+  version: 3.0.2.0
 platform: ruby
 authors:
 - whitequark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -205,6 +205,7 @@ files:
 - lib/parser/ruby27.rb
 - lib/parser/ruby28.rb
 - lib/parser/ruby30.rb
+- lib/parser/ruby31.rb
 - lib/parser/rubymotion.rb
 - lib/parser/runner.rb
 - lib/parser/runner/ruby_parse.rb
@@ -244,9 +245,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v3.0.0.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/3.0.0.0
-  source_code_uri: https://github.com/whitequark/parser/tree/v3.0.0.0
+  changelog_uri: https://github.com/whitequark/parser/blob/v3.0.2.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/3.0.2.0
+  source_code_uri: https://github.com/whitequark/parser/tree/v3.0.2.0
 post_install_message:
 rdoc_options: []
 require_paths: