parser 3.3.0.5 → 3.3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6522bb3594d6cc37d08b4b3dc827c4796933a368ac8518e9e3aa036795359819
-  data.tar.gz: 65e8a84d3efef60da0460b2270a3127b8bb92534797a003c29de33a9caa538a7
+  metadata.gz: 9eb046630686391eb9f142fc7d246cde16fbed4e56439b393d3fe0afe9a21db1
+  data.tar.gz: 7fe34e65b83d77aa819638f9977316a53b9233f71363b1c62aeaa5f03aea7259
 SHA512:
-  metadata.gz: 0ff8c442f2d7638629a2cbefae2b0432bec189cb7846c62217da0bc5709559bd93b870af4bf061d4998067955c7649ee531910f7e13a4902ba02a329bbc171b3
-  data.tar.gz: d97e4af8e9c64bad8aaf4a76d9359a30683f8528de3727522b0bc73c25259a796051c708c1b1489ce7b4dbf336e0835897795364c4db8c0a819c632d32cc48aa
+  metadata.gz: 78d334c12f70da2a91caab8fd8a7a633780fb49a0a36bc6d21022e840502bf02329f1ba3895548ca737bde870a383cf357b7c1eb7291c439ab8029710e4f63b1
+  data.tar.gz: d9b1b2c45c28aea4533c6d466e7c60cf36e301a380e127a86552eebe2e949aa993c724754bf35f8cf92f92efa218c82f528ef92575b953d981e2ef7be042dc59

data/lib/gauntlet_parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'gauntlet'
-require 'parser/all'
+require_relative 'parser/all'
 require 'shellwords'
 
 class ParserGauntlet < Gauntlet

data/lib/parser/all.rb

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'parser/ruby18'
-require 'parser/ruby19'
-require 'parser/ruby20'
-require 'parser/ruby21'
-require 'parser/ruby22'
-require 'parser/ruby23'
-require 'parser/ruby24'
-require 'parser/ruby25'
-require 'parser/ruby26'
-require 'parser/ruby27'
-require 'parser/ruby30'
-require 'parser/ruby31'
-require 'parser/ruby32'
-require 'parser/ruby33'
-require 'parser/ruby34'
+require_relative 'ruby18'
+require_relative 'ruby19'
+require_relative 'ruby20'
+require_relative 'ruby21'
+require_relative 'ruby22'
+require_relative 'ruby23'
+require_relative 'ruby24'
+require_relative 'ruby25'
+require_relative 'ruby26'
+require_relative 'ruby27'
+require_relative 'ruby30'
+require_relative 'ruby31'
+require_relative 'ruby32'
+require_relative 'ruby33'
+require_relative 'ruby34'

data/lib/parser/ast/processor.rb

@@ -6,7 +6,9 @@ module Parser
     ##
     # @api public
     #
-    class Processor < ::AST::Processor
+    class Processor
+      include ::AST::Processor::Mixin
+
       def process_regular_node(node)
         node.updated(nil, process_all(node))
       end

data/lib/parser/builders/default.rb

@@ -426,7 +426,7 @@ module Parser
     def regexp_compose(begin_t, parts, end_t, options)
       begin
         static_regexp(parts, options)
-      rescue RegexpError => e
+      rescue RegexpError, Encoding::UndefinedConversionError => e
         diagnostic :error, :invalid_regexp, { :message => e.message },
                    loc(begin_t).join(loc(end_t))
       end

data/lib/parser/current.rb

@@ -17,7 +17,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby20', current_version
     end
 
-    require 'parser/ruby20'
+    require_relative 'ruby20'
     CurrentRuby = Ruby20
 
   when /^2\.1\./
@@ -26,7 +26,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby21', current_version
     end
 
-    require 'parser/ruby21'
+    require_relative 'ruby21'
     CurrentRuby = Ruby21
 
   when /^2\.2\./
@@ -35,7 +35,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby22', current_version
     end
 
-    require 'parser/ruby22'
+    require_relative 'ruby22'
     CurrentRuby = Ruby22
 
   when /^2\.3\./
@@ -44,7 +44,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby23', current_version
     end
 
-    require 'parser/ruby23'
+    require_relative 'ruby23'
     CurrentRuby = Ruby23
 
   when /^2\.4\./
@@ -53,7 +53,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby24', current_version
     end
 
-    require 'parser/ruby24'
+    require_relative 'ruby24'
     CurrentRuby = Ruby24
 
   when /^2\.5\./
@@ -62,7 +62,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby25', current_version
     end
 
-    require 'parser/ruby25'
+    require_relative 'ruby25'
     CurrentRuby = Ruby25
 
   when /^2\.6\./
@@ -71,7 +71,7 @@ module Parser
       warn_syntax_deviation 'parser/ruby26', current_version
     end
 
-    require 'parser/ruby26'
+    require_relative 'ruby26'
     CurrentRuby = Ruby26
 
   when /^2\.7\./
@@ -80,43 +80,43 @@ module Parser
       warn_syntax_deviation 'parser/ruby27', current_version
     end
 
-    require 'parser/ruby27'
+    require_relative 'ruby27'
     CurrentRuby = Ruby27
 
   when /^3\.0\./
-    current_version = '3.0.6'
+    current_version = '3.0.7'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby30', current_version
     end
 
-    require 'parser/ruby30'
+    require_relative 'ruby30'
     CurrentRuby = Ruby30
 
   when /^3\.1\./
-    current_version = '3.1.4'
+    current_version = '3.1.6'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby31', current_version
     end
 
-    require 'parser/ruby31'
+    require_relative 'ruby31'
     CurrentRuby = Ruby31
 
   when /^3\.2\./
-    current_version = '3.2.3'
+    current_version = '3.2.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby32', current_version
     end
 
-    require 'parser/ruby32'
+    require_relative 'ruby32'
     CurrentRuby = Ruby32
 
   when /^3\.3\./
-    current_version = '3.3.0'
+    current_version = '3.3.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby33', current_version
     end
 
-    require 'parser/ruby33'
+    require_relative 'ruby33'
     CurrentRuby = Ruby33
 
   when /^3\.4\./
@@ -125,13 +125,13 @@ module Parser
       warn_syntax_deviation 'parser/ruby34', current_version
     end
 
-    require 'parser/ruby34'
+    require_relative 'ruby34'
     CurrentRuby = Ruby34
 
   else # :nocov:
     # Keep this in sync with released Ruby.
     warn_syntax_deviation 'parser/ruby33', '3.3.x'
-    require 'parser/ruby33'
+    require_relative 'ruby33'
     CurrentRuby = Ruby33
   end
 end

data/lib/parser/macruby.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "macruby.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class MacRuby < Parser::Base

data/lib/parser/ruby18.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby18.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby18 < Parser::Base

data/lib/parser/ruby19.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby19.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby19 < Parser::Base

data/lib/parser/ruby20.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby20.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby20 < Parser::Base

data/lib/parser/ruby21.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby21.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby21 < Parser::Base

data/lib/parser/ruby22.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby22.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby22 < Parser::Base

data/lib/parser/ruby23.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby23.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby23 < Parser::Base

data/lib/parser/ruby24.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby24.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby24 < Parser::Base

data/lib/parser/ruby25.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby25.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby25 < Parser::Base

data/lib/parser/ruby26.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby26.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby26 < Parser::Base

data/lib/parser/ruby27.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby27.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby27 < Parser::Base

data/lib/parser/ruby30.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby30.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby30 < Parser::Base

data/lib/parser/ruby31.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby31.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby31 < Parser::Base

data/lib/parser/ruby32.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby32.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby32 < Parser::Base

data/lib/parser/ruby33.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby33.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby33 < Parser::Base
@@ -9905,7 +9905,7 @@ def _reduce_291(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_blockarg? && @static_env.parent_has_anonymous_blockarg?
+                        @static_env.declared_anonymous_blockarg_in_current_scpe? && @static_env.parent_has_anonymous_blockarg?
                         diagnostic :error, :ambiguous_anonymous_blockarg, nil, val[0]
                       end
 
@@ -9958,7 +9958,7 @@ def _reduce_299(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_restarg? && @static_env.parent_has_anonymous_restarg?
+                        @static_env.declared_anonymous_restarg_in_current_scope? && @static_env.parent_has_anonymous_restarg?
                         diagnostic :error, :ambiguous_anonymous_restarg, nil, val[0]
                       end
 
@@ -10977,7 +10977,7 @@ end
 
 def _reduce_457(val, _values, result)
                       result = @context.in_kwarg
-                      
+
                       @lexer.state = :expr_beg
                       @lexer.command_start = false
                       @context.in_kwarg = true
@@ -12492,7 +12492,7 @@ def _reduce_715(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_kwrestarg? && @static_env.parent_has_anonymous_kwrestarg?
+                        @static_env.declared_anonymous_kwrestarg_in_current_scope? && @static_env.parent_has_anonymous_kwrestarg?
                         diagnostic :error, :ambiguous_anonymous_kwrestarg, nil, val[0]
                       end
 

data/lib/parser/ruby34.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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "ruby34.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class Ruby34 < Parser::Base
@@ -9905,7 +9905,7 @@ def _reduce_291(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_blockarg? && @static_env.parent_has_anonymous_blockarg?
+                        @static_env.declared_anonymous_blockarg_in_current_scpe? && @static_env.parent_has_anonymous_blockarg?
                         diagnostic :error, :ambiguous_anonymous_blockarg, nil, val[0]
                       end
 
@@ -9958,7 +9958,7 @@ def _reduce_299(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_restarg? && @static_env.parent_has_anonymous_restarg?
+                        @static_env.declared_anonymous_restarg_in_current_scope? && @static_env.parent_has_anonymous_restarg?
                         diagnostic :error, :ambiguous_anonymous_restarg, nil, val[0]
                       end
 
@@ -12492,7 +12492,7 @@ def _reduce_715(val, _values, result)
                       end
 
                       if @context.in_dynamic_block? && context.in_def &&
-                        @static_env.declared_anonymous_kwrestarg? && @static_env.parent_has_anonymous_kwrestarg?
+                        @static_env.declared_anonymous_kwrestarg_in_current_scope? && @static_env.parent_has_anonymous_kwrestarg?
                         diagnostic :error, :ambiguous_anonymous_kwrestarg, nil, val[0]
                       end
 

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.7.3
+# This file is automatically generated by Racc 1.8.1
 # from Racc grammar file "rubymotion.y".
 #
 
 require 'racc/parser.rb'
 
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
   class RubyMotion < Parser::Base

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

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require 'benchmark'
 require 'find'
 require 'optparse'
 
-require 'parser'
+require_relative '../parser'
 
 module Parser
 
@@ -64,87 +63,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 'parser/ruby33'
+        require_relative 'ruby33'
         @parser_class = Parser::Ruby33
       end
 
       opts.on '--34', 'Parse as Ruby 3.4 would' do
-        require 'parser/ruby34'
+        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
 
@@ -193,7 +192,7 @@ module Parser
       end
 
       if @parser_class.nil?
-        require 'parser/current'
+        require_relative 'current'
         @parser_class = Parser::CurrentRuby
       end
     end
@@ -220,14 +219,13 @@ module Parser
     end
 
     def process_all_input
-      parsing_time =
-        Benchmark.measure do
-          process_fragments
-          process_files
-        end
+      time_start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      process_fragments
+      process_files
+      time_elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - time_start
 
       if @benchmark
-        report_with_time(parsing_time)
+        report_with_time(time_elapsed)
       end
     end
 
@@ -278,12 +276,10 @@ module Parser
       raise NotImplementedError, "implement #{self.class}##{__callee__}"
     end
 
-    def report_with_time(parsing_time)
-      cpu_time = parsing_time.utime
-
-      speed = '%.3f' % (@source_size / cpu_time / 1000)
+    def report_with_time(time_elapsed)
+      speed = '%.3f' % (@source_size / time_elapsed / 1000)
       puts "Parsed #{@source_count} files (#{@source_size} characters)" \
-           " in #{'%.2f' % cpu_time} seconds (#{speed} kchars/s)."
+           " in #{'%.2f' % time_elapsed} seconds (#{speed} kchars/s)."
 
       if defined?(RUBY_ENGINE)
         engine = RUBY_ENGINE

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

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,40 +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) }
+      @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) }
+      @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) }
+      @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.3.0.5'
+  VERSION = '3.3.5.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,74 +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'
 
   if RUBY_ENGINE == 'truffleruby'
-    require 'parser/lexer-F0'
+    require_relative 'parser/lexer-F0'
   else
-    require 'parser/lexer-F1'
+    require_relative 'parser/lexer-F1'
   end
-  require 'parser/lexer-strings'
-  require 'parser/lexer/literal'
-  require 'parser/lexer/stack_state'
-  require 'parser/lexer/dedenter'
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parser
 version: !ruby/object:Gem::Version
-  version: 3.3.0.5
+  version: 3.3.5.0
 platform: ruby
 authors:
 - whitequark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-21 00:00:00.000000000 Z
+date: 2024-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ast
@@ -242,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
@@ -250,9 +251,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/whitequark/parser/issues
-  changelog_uri: https://github.com/whitequark/parser/blob/v3.3.0.5/CHANGELOG.md
-  documentation_uri: https://www.rubydoc.info/gems/parser/3.3.0.5
-  source_code_uri: https://github.com/whitequark/parser/tree/v3.3.0.5
+  changelog_uri: https://github.com/whitequark/parser/blob/v3.3.5.0/CHANGELOG.md
+  documentation_uri: https://www.rubydoc.info/gems/parser/3.3.5.0
+  source_code_uri: https://github.com/whitequark/parser/tree/v3.3.5.0
 post_install_message:
 rdoc_options: []
 require_paths: