parser 3.2.2.3 → 3.3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df2e6383fb2571b7b534703d56589f4ee58235cf8579eb42409915bad548bf1
-  data.tar.gz: ae96b9894891d64599e0253d35a274f41e17d5a7f1d18c2b121faedd1d5ee978
+  metadata.gz: afc1515c06b8557b5f15fcc7575524189c127b94184ecdce6df93960a4d97516
+  data.tar.gz: b5a2d1b9e4ec2446b98f6d6de6d68c7b3c6fce7b57556e03e6b68938d2dee1ef
 SHA512:
-  metadata.gz: a225b9a96a99999e59b4d4c61f056e7501073a9b69bed0987f6ea7272f38efe7aaae50901cfbf3074c4de6174622bf9282ecd8b1b915ecc9aed462ebde2e6faf
-  data.tar.gz: 17116f52ec7abc4f13fd1fecf9c0edf0c8a0fc07294c1b60eb5c7c113571788a5ef3c077e7e774671a490d8c606f0dce52723f84cb9752ea580ee1d764c16066
+  metadata.gz: 6677f0acce4584140ae9bf9597c583986496e68a4411799d0172e6a9f13e6b78fceee4844b278091f0c5fb9db66417faa18db51e854b0901313d942650ceb402
+  data.tar.gz: 81f225e76c4ed00ca5ccd2598200423fcc9c03ef6a5d2d331c5b592a6ae8d53d4c33129383b30e671e115d024ec0d553f8c4bfa89223557111f69cd43598b38c

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,16 +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_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

@@ -594,7 +594,13 @@ module Parser
     end
 
     def gvar(token)
-      n(:gvar, [ value(token).to_sym ],
+      gvar_name = value(token)
+
+      if gvar_name.start_with?('$0') && gvar_name.length > 2
+        diagnostic :error, :gvar_name, { :name => gvar_name }, loc(token)
+      end
+
+      n(:gvar, [ gvar_name.to_sym ],
         variable_map(token))
     end
 
@@ -654,6 +660,13 @@ module Parser
         end
 
         unless @parser.static_env.declared?(name)
+          if @parser.version == 33 &&
+              name == :it &&
+              @parser.context.in_block &&
+              !@parser.max_numparam_stack.has_ordinary_params?
+            diagnostic :warning, :ambiguous_it_call, nil, node.loc.expression
+          end
+
           return n(:send, [ nil, name ],
             var_send_map(node))
         end
@@ -1690,24 +1703,34 @@ module Parser
           cond
         end
 
-      when :and, :or, :irange, :erange
+      when :and, :or
         lhs, rhs = *cond
 
-        type = case cond.type
-        when :irange then :iflipflop
-        when :erange then :eflipflop
-        end
-
-        if [:and, :or].include?(cond.type) &&
-               @parser.version == 18
+        if @parser.version == 18
           cond
         else
-          cond.updated(type, [
+          cond.updated(cond.type, [
             check_condition(lhs),
             check_condition(rhs)
           ])
         end
 
+      when :irange, :erange
+        lhs, rhs = *cond
+
+        type = case cond.type
+        when :irange then :iflipflop
+        when :erange then :eflipflop
+        end
+
+        lhs_condition = check_condition(lhs) unless lhs.nil?
+        rhs_condition = check_condition(rhs) unless rhs.nil?
+
+        return cond.updated(type, [
+          lhs_condition,
+          rhs_condition
+        ])
+
       when :regexp
         n(:match_current_line, [ cond ], expr_map(cond.loc.expression))
 
@@ -2245,6 +2268,10 @@ module Parser
 
     def static_regexp_node(node)
       if node.type == :regexp
+        if @parser.version >= 33 && node.children[0..-2].any? { |child| child.type != :str }
+          return nil
+        end
+
         parts, options = node.children[0..-2], node.children[-1]
         static_regexp(parts, options)
       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,49 +80,58 @@ 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.2'
+    current_version = '3.2.4'
     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-dev'
+    current_version = '3.3.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby33', current_version
     end
 
-    require 'parser/ruby33'
+    require_relative 'ruby33'
     CurrentRuby = Ruby33
 
+  when /^3\.4\./
+    current_version = '3.4.0'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby34', current_version
+    end
+
+    require_relative 'ruby34'
+    CurrentRuby = Ruby34
+
   else # :nocov:
     # Keep this in sync with released Ruby.
-    warn_syntax_deviation 'parser/ruby32', '3.2.x'
-    require 'parser/ruby32'
-    CurrentRuby = Ruby32
+    warn_syntax_deviation 'parser/ruby33', '3.3.x'
+    require_relative 'ruby33'
+    CurrentRuby = Ruby33
   end
 end

data/lib/parser/lexer/literal.rb

@@ -5,6 +5,8 @@ module Parser
 
   class Lexer::Literal
     DELIMITERS = { '(' => ')', '[' => ']', '{' => '}', '<' => '>' }
+    SPACE = ' '.ord
+    TAB = "\t".ord
 
     TYPES = {
     # type       start token     interpolate?
@@ -234,7 +236,20 @@ module Parser
     protected
 
     def delimiter?(delimiter)
-      if @indent
+      if heredoc?
+        # This heredoc is valid:
+        # <<~E
+        #   E
+        # and this:
+        # <<~E
+        # E
+        # but this one is not:
+        # <<~'  E'
+        # E
+        # because there are not enough leading spaces in the closing delimiter.
+        delimiter.end_with?(@end_delim) &&
+          delimiter.sub(/#{Regexp.escape(@end_delim)}\z/, '').bytes.all? { |c| c == SPACE || c == TAB }
+      elsif @indent
         @end_delim == delimiter.lstrip
       else
         @end_delim == delimiter