parser 3.1.3.0 → 3.3.2.0

data/lib/parser/rubymotion.rb

@@ -1,14 +1,14 @@
 # -*- encoding:utf-8; warn-indent:false; frozen_string_literal: true  -*-
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.6.0
-# from Racc grammar file "".
+# This file is automatically generated by Racc 1.7.3
+# from Racc grammar file "rubymotion.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class RubyMotion < Parser::Base
@@ -6160,6 +6160,7 @@ Racc_arg = [
   racc_shift_n,
   racc_reduce_n,
   racc_use_result_var ]
+Ractor.make_shareable(Racc_arg) if defined?(Ractor)
 
 Racc_token_to_s_table = [
   "$end",
@@ -6456,6 +6457,7 @@ Racc_token_to_s_table = [
   "restarg_mark",
   "blkarg_mark",
   "assoc" ]
+Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = false
 

data/lib/parser/runner/ruby_parse.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'parser/runner'
-require 'parser/color'
-require 'parser/lexer/explanation'
+require_relative '../runner'
+require_relative '../color'
+require_relative '../lexer/explanation'
 require 'json'
 
 module Parser

data/lib/parser/runner/ruby_rewrite.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'parser/runner'
+require_relative '../runner'
 require 'tempfile'
 
 module Parser

data/lib/parser/runner.rb

@@ -4,7 +4,7 @@ require 'benchmark'
 require 'find'
 require 'optparse'
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
 
@@ -64,77 +64,87 @@ module Parser
       end
 
       opts.on '--18', 'Parse as Ruby 1.8.7 would' do
-        require 'parser/ruby18'
+        require_relative 'ruby18'
         @parser_class = Parser::Ruby18
       end
 
       opts.on '--19', 'Parse as Ruby 1.9.3 would' do
-        require 'parser/ruby19'
+        require_relative 'ruby19'
         @parser_class = Parser::Ruby19
       end
 
       opts.on '--20', 'Parse as Ruby 2.0 would' do
-        require 'parser/ruby20'
+        require_relative 'ruby20'
         @parser_class = Parser::Ruby20
       end
 
       opts.on '--21', 'Parse as Ruby 2.1 would' do
-        require 'parser/ruby21'
+        require_relative 'ruby21'
         @parser_class = Parser::Ruby21
       end
 
       opts.on '--22', 'Parse as Ruby 2.2 would' do
-        require 'parser/ruby22'
+        require_relative 'ruby22'
         @parser_class = Parser::Ruby22
       end
 
       opts.on '--23', 'Parse as Ruby 2.3 would' do
-        require 'parser/ruby23'
+        require_relative 'ruby23'
         @parser_class = Parser::Ruby23
       end
 
       opts.on '--24', 'Parse as Ruby 2.4 would' do
-        require 'parser/ruby24'
+        require_relative 'ruby24'
         @parser_class = Parser::Ruby24
       end
 
       opts.on '--25', 'Parse as Ruby 2.5 would' do
-        require 'parser/ruby25'
+        require_relative 'ruby25'
         @parser_class = Parser::Ruby25
       end
 
       opts.on '--26', 'Parse as Ruby 2.6 would' do
-        require 'parser/ruby26'
+        require_relative 'ruby26'
         @parser_class = Parser::Ruby26
       end
 
       opts.on '--27', 'Parse as Ruby 2.7 would' do
-        require 'parser/ruby27'
+        require_relative 'ruby27'
         @parser_class = Parser::Ruby27
       end
 
       opts.on '--30', 'Parse as Ruby 3.0 would' do
-        require 'parser/ruby30'
+        require_relative 'ruby30'
         @parser_class = Parser::Ruby30
       end
 
       opts.on '--31', 'Parse as Ruby 3.1 would' do
-        require 'parser/ruby31'
+        require_relative 'ruby31'
         @parser_class = Parser::Ruby31
       end
 
       opts.on '--32', 'Parse as Ruby 3.2 would' do
-        require 'parser/ruby32'
+        require_relative 'ruby32'
         @parser_class = Parser::Ruby32
       end
 
+      opts.on '--33', 'Parse as Ruby 3.3 would' do
+        require_relative 'ruby33'
+        @parser_class = Parser::Ruby33
+      end
+
+      opts.on '--34', 'Parse as Ruby 3.4 would' do
+        require_relative 'ruby34'
+        @parser_class = Parser::Ruby34
+      end
+
       opts.on '--mac', 'Parse as MacRuby 0.12 would' do
-        require 'parser/macruby'
+        require_relative 'macruby'
         @parser_class = Parser::MacRuby
       end
 
       opts.on '--ios', 'Parse as mid-2015 RubyMotion would' do
-        require 'parser/rubymotion'
+        require_relative 'rubymotion'
         @parser_class = Parser::RubyMotion
       end
 
@@ -183,7 +193,7 @@ module Parser
       end
 
       if @parser_class.nil?
-        require 'parser/current'
+        require_relative 'current'
         @parser_class = Parser::CurrentRuby
       end
     end

data/lib/parser/source/buffer.rb

@@ -46,6 +46,7 @@ module Parser
       # magic encoding comment or UTF-8 BOM. `string` can be in any encoding.
       #
       # @param [String]  string
+      # @raise [Parser::UnknownEncodingInMagicComment] if the encoding is not recognized
       # @return [String, nil] encoding name, if recognized
       #
       def self.recognize_encoding(string)
@@ -66,7 +67,11 @@ module Parser
         return nil if encoding_line.nil? || encoding_line[0] != '#'
 
         if (result = ENCODING_RE.match(encoding_line))
-          Encoding.find(result[3] || result[4] || result[6])
+          begin
+            Encoding.find(result[3] || result[4] || result[6])
+          rescue ArgumentError => e
+            raise Parser::UnknownEncodingInMagicComment, e.message
+          end
         else
           nil
         end
@@ -191,11 +196,20 @@ module Parser
         end
       end
 
-      def slice(range)
+      def slice(start, length = nil)
+        if length.nil?
+          if start.is_a?(::Range)
+            length = start.size
+            start = start.begin
+          else
+            length = 1
+          end
+        end
+
         if @slice_source.nil?
-          @source[range]
+          @source[start, length]
         else
-          @slice_source[range].encode(@source.encoding)
+          @slice_source[start, length].encode(@source.encoding)
         end
       end
 

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

@@ -95,10 +95,11 @@ module Parser
       end
 
       ##
-      # Same as {associate}, but compares by identity, thus producing an unambiguous
-      # result even in presence of equal nodes.
+      # Same as {associate}, but uses `node.loc` instead of `node` as
+      # the hash key, thus producing an unambiguous result even in presence
+      # of equal nodes.
       #
-      # @return [Hash<Parser::Source::Node, Array<Parser::Source::Comment>>]
+      # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
       #
       def associate_locations
         @map_using = :location
@@ -106,11 +107,10 @@ module Parser
       end
 
       ##
-      # Same as {associate}, but uses `node.loc` instead of `node` as
-      # the hash key, thus producing an unambiguous result even in presence
-      # of equal nodes.
+      # Same as {associate}, but compares by identity, thus producing an unambiguous
+      # result even in presence of equal nodes.
       #
-      # @return [Hash<Parser::Source::Map, Array<Parser::Source::Comment>>]
+      # @return [Hash<Parser::Source::Node, Array<Parser::Source::Comment>>]
       #
       def associate_by_identity
         @map_using = :identity

data/lib/parser/source/range.rb

@@ -130,7 +130,7 @@ module Parser
       # @return [String] all source code covered by this range.
       #
       def source
-        @source_buffer.slice(self.begin_pos...self.end_pos)
+        @source_buffer.slice(@begin_pos, @end_pos - @begin_pos)
       end
 
       ##

data/lib/parser/source/tree_rewriter/action.rb

@@ -6,9 +6,10 @@ module Parser
     # @api private
     #
     # Actions are arranged in a tree and get combined so that:
-    #   children are strictly contained by their parent
-    #   sibblings all disjoint from one another and ordered
-    #   only actions with replacement==nil may have children
+    # 
+    # * Children are strictly contained by their parent
+    # * Siblings are all disjointed from one another and ordered
+    # * Only actions with `replacement == nil` may have children
     #
     class TreeRewriter::Action
       attr_reader :range, :replacement, :insert_before, :insert_after
@@ -60,7 +61,7 @@ module Parser
 
       ##
       # A root action has its range set to the whole source range, even
-      # though it typically do not act on that range.
+      # though it typically does not act on that range.
       # This method returns the action as if it was a child action with
       # its range contracted.
       # @return [Action]

data/lib/parser/static_environment.rb

@@ -4,9 +4,15 @@ module Parser
 
   class StaticEnvironment
     FORWARD_ARGS = :FORWARD_ARGS
-    ANONYMOUS_BLOCKARG = :ANONYMOUS_BLOCKARG
-    ANONYMOUS_RESTARG = :ANONYMOUS_RESTARG
-    ANONYMOUS_KWRESTARG = :ANONYMOUS_KWRESTARG
+
+    ANONYMOUS_RESTARG_IN_CURRENT_SCOPE = :ANONYMOUS_RESTARG_IN_CURRENT_SCOPE
+    ANONYMOUS_RESTARG_INHERITED = :ANONYMOUS_RESTARG_INHERITED
+
+    ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE = :ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE
+    ANONYMOUS_KWRESTARG_INHERITED = :ANONYMOUS_KWRESTARG_INHERITED
+
+    ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE = :ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE
+    ANONYMOUS_BLOCKARG_INHERITED = :ANONYMOUS_BLOCKARG_INHERITED
 
     def initialize
       reset
@@ -27,6 +33,15 @@ module Parser
     def extend_dynamic
       @stack.push(@variables)
       @variables = @variables.dup
+      if @variables.delete(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
+        @variables.add(ANONYMOUS_BLOCKARG_INHERITED)
+      end
+      if @variables.delete(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
+        @variables.add(ANONYMOUS_RESTARG_INHERITED)
+      end
+      if @variables.delete(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
+        @variables.add(ANONYMOUS_KWRESTARG_INHERITED)
+      end
 
       self
     end
@@ -47,6 +62,8 @@ module Parser
       @variables.include?(name.to_sym)
     end
 
+    # Forward args
+
     def declare_forward_args
       declare(FORWARD_ARGS)
     end
@@ -55,28 +72,58 @@ module Parser
       declared?(FORWARD_ARGS)
     end
 
+    # Anonymous blockarg
+
     def declare_anonymous_blockarg
-      declare(ANONYMOUS_BLOCKARG)
+      declare(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
     end
 
     def declared_anonymous_blockarg?
-      declared?(ANONYMOUS_BLOCKARG)
+      declared?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_BLOCKARG_INHERITED)
     end
 
+    def declared_anonymous_blockarg_in_current_scpe?
+      declared?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE)
+    end
+
+    def parent_has_anonymous_blockarg?
+      @stack.any? { |variables| variables.include?(ANONYMOUS_BLOCKARG_IN_CURRENT_SCOPE) }
+    end
+
+    # Anonymous restarg
+
     def declare_anonymous_restarg
-      declare(ANONYMOUS_RESTARG)
+      declare(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
     end
 
     def declared_anonymous_restarg?
-      declared?(ANONYMOUS_RESTARG)
+      declared?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_RESTARG_INHERITED)
     end
 
+    def declared_anonymous_restarg_in_current_scope?
+      declared?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE)
+    end
+
+    def parent_has_anonymous_restarg?
+      @stack.any? { |variables| variables.include?(ANONYMOUS_RESTARG_IN_CURRENT_SCOPE) }
+    end
+
+    # Anonymous kwresarg
+
     def declare_anonymous_kwrestarg
-      declare(ANONYMOUS_KWRESTARG)
+      declare(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
     end
 
     def declared_anonymous_kwrestarg?
-      declared?(ANONYMOUS_KWRESTARG)
+      declared?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE) || declared?(ANONYMOUS_KWRESTARG_INHERITED)
+    end
+
+    def declared_anonymous_kwrestarg_in_current_scope?
+      declared?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE)
+    end
+
+    def parent_has_anonymous_kwrestarg?
+      @stack.any? { |variables| variables.include?(ANONYMOUS_KWRESTARG_IN_CURRENT_SCOPE) }
     end
 
     def empty?

data/lib/parser/unknown_encoding_in_magic_comment_error.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Parser
+  ##
+  # {Parser::UnknownEncodingInMagicComment} is raised when a magic encoding
+  # comment is encountered that the currently running Ruby version doesn't
+  # recognize. It inherits from {ArgumentError} since that is the exception
+  # Ruby itself raises when trying to execute a file with an unknown encoding.
+  # As such, it is also not a {Parser::SyntaxError}.
+  #
+  # @api public
+  #
+  class UnknownEncodingInMagicComment < ArgumentError
+  end
+end

data/lib/parser/version.rb

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

data/lib/parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 if RUBY_VERSION =~ /^1\.[89]\./
-  require 'parser/version'
+  require_relative 'parser/version'
   raise LoadError, <<-UNSUPPORTED_VERSION_MSG
 parser v#{Parser::VERSION} cannot run on Ruby #{RUBY_VERSION}.
 Please upgrade to Ruby 2.0.0 or higher, or use an older version of the parser gem.
@@ -17,69 +17,75 @@ require 'ast'
 # @api public
 #
 module Parser
-  require 'parser/version'
-  require 'parser/messages'
-  require 'parser/deprecation'
+  require_relative 'parser/version'
+  require_relative 'parser/messages'
+  require_relative 'parser/deprecation'
 
   module AST
-    require 'parser/ast/node'
-    require 'parser/ast/processor'
-    require 'parser/meta'
+    require_relative 'parser/ast/node'
+    require_relative 'parser/ast/processor'
+    require_relative 'parser/meta'
   end
 
   module Source
-    require 'parser/source/buffer'
-    require 'parser/source/range'
-
-    require 'parser/source/comment'
-    require 'parser/source/comment/associator'
-
-    require 'parser/source/rewriter'
-    require 'parser/source/rewriter/action'
-    require 'parser/source/tree_rewriter'
-    require 'parser/source/tree_rewriter/action'
-
-    require 'parser/source/map'
-    require 'parser/source/map/operator'
-    require 'parser/source/map/collection'
-    require 'parser/source/map/constant'
-    require 'parser/source/map/variable'
-    require 'parser/source/map/keyword'
-    require 'parser/source/map/definition'
-    require 'parser/source/map/method_definition'
-    require 'parser/source/map/send'
-    require 'parser/source/map/index'
-    require 'parser/source/map/condition'
-    require 'parser/source/map/ternary'
-    require 'parser/source/map/for'
-    require 'parser/source/map/rescue_body'
-    require 'parser/source/map/heredoc'
-    require 'parser/source/map/objc_kwarg'
+    require_relative 'parser/source/buffer'
+    require_relative 'parser/source/range'
+
+    require_relative 'parser/source/comment'
+    require_relative 'parser/source/comment/associator'
+
+    require_relative 'parser/source/rewriter'
+    require_relative 'parser/source/rewriter/action'
+    require_relative 'parser/source/tree_rewriter'
+    require_relative 'parser/source/tree_rewriter/action'
+
+    require_relative 'parser/source/map'
+    require_relative 'parser/source/map/operator'
+    require_relative 'parser/source/map/collection'
+    require_relative 'parser/source/map/constant'
+    require_relative 'parser/source/map/variable'
+    require_relative 'parser/source/map/keyword'
+    require_relative 'parser/source/map/definition'
+    require_relative 'parser/source/map/method_definition'
+    require_relative 'parser/source/map/send'
+    require_relative 'parser/source/map/index'
+    require_relative 'parser/source/map/condition'
+    require_relative 'parser/source/map/ternary'
+    require_relative 'parser/source/map/for'
+    require_relative 'parser/source/map/rescue_body'
+    require_relative 'parser/source/map/heredoc'
+    require_relative 'parser/source/map/objc_kwarg'
   end
 
-  require 'parser/syntax_error'
-  require 'parser/clobbering_error'
-  require 'parser/diagnostic'
-  require 'parser/diagnostic/engine'
+  require_relative 'parser/syntax_error'
+  require_relative 'parser/clobbering_error'
+  require_relative 'parser/unknown_encoding_in_magic_comment_error'
+  require_relative 'parser/diagnostic'
+  require_relative 'parser/diagnostic/engine'
 
-  require 'parser/static_environment'
+  require_relative 'parser/static_environment'
 
-  require 'parser/lexer'
-  require 'parser/lexer/literal'
-  require 'parser/lexer/stack_state'
-  require 'parser/lexer/dedenter'
+  if RUBY_ENGINE == 'truffleruby'
+    require_relative 'parser/lexer-F0'
+  else
+    require_relative 'parser/lexer-F1'
+  end
+  require_relative 'parser/lexer-strings'
+  require_relative 'parser/lexer/literal'
+  require_relative 'parser/lexer/stack_state'
+  require_relative 'parser/lexer/dedenter'
 
   module Builders
-    require 'parser/builders/default'
+    require_relative 'parser/builders/default'
   end
 
-  require 'parser/context'
-  require 'parser/max_numparam_stack'
-  require 'parser/current_arg_stack'
-  require 'parser/variables_stack'
+  require_relative 'parser/context'
+  require_relative 'parser/max_numparam_stack'
+  require_relative 'parser/current_arg_stack'
+  require_relative 'parser/variables_stack'
 
-  require 'parser/base'
+  require_relative 'parser/base'
 
-  require 'parser/rewriter'
-  require 'parser/tree_rewriter'
+  require_relative 'parser/rewriter'
+  require_relative 'parser/tree_rewriter'
 end

data/parser.gemspec

@@ -27,10 +27,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency             'ast',       '~> 2.4.1'
+  spec.add_dependency             'racc'
 
   spec.add_development_dependency 'bundler',   '>= 1.15', '< 3.0.0'
   spec.add_development_dependency 'rake',      '~> 13.0.1'
-  spec.add_development_dependency 'racc',      '= 1.6.0'
   spec.add_development_dependency 'cliver',    '~> 0.3.2'
 
   spec.add_development_dependency 'yard'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 3.1.3.0
+  version: 3.3.2.0
 platform: ruby
 authors:
 - whitequark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 2024-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +72,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.1
-- !ruby/object:Gem::Dependency
-  name: racc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: cliver
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,9 @@ files:
 - lib/parser/deprecation.rb
 - lib/parser/diagnostic.rb
 - lib/parser/diagnostic/engine.rb
-- lib/parser/lexer.rb
+- lib/parser/lexer-F0.rb
+- lib/parser/lexer-F1.rb
+- lib/parser/lexer-strings.rb
 - lib/parser/lexer/dedenter.rb
 - lib/parser/lexer/explanation.rb
 - lib/parser/lexer/literal.rb
@@ -207,6 +209,8 @@ files:
 - lib/parser/ruby30.rb
 - lib/parser/ruby31.rb
 - lib/parser/ruby32.rb
+- lib/parser/ruby33.rb
+- lib/parser/ruby34.rb
 - lib/parser/rubymotion.rb
 - lib/parser/runner.rb
 - lib/parser/runner/ruby_parse.rb
@@ -238,6 +242,7 @@ files:
 - lib/parser/static_environment.rb
 - lib/parser/syntax_error.rb
 - lib/parser/tree_rewriter.rb
+- lib/parser/unknown_encoding_in_magic_comment_error.rb
 - lib/parser/variables_stack.rb
 - lib/parser/version.rb
 - parser.gemspec
@@ -246,9 +251,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v3.1.3.0/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/3.1.3.0
-  source_code_uri: https://github.com/whitequark/parser/tree/v3.1.3.0
+  changelog_uri: https://github.com/whitequark/parser/blob/v3.3.2.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/3.3.2.0
+  source_code_uri: https://github.com/whitequark/parser/tree/v3.3.2.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -264,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A Ruby parser written in pure Ruby.