parser 3.1.3.0 → 3.3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41190efffa46e773dca6e8579ecca87ded55e3156774838d0e6bea3cec40803e
-  data.tar.gz: e9219ad92e0da926e964d5f13a00208e772f4f3ba2af7910ac13fd9bf9dcb19b
+  metadata.gz: 6b1e8c490a997a2df26e2e03604458f20f94295241ed5b99dfbe45d7f06bac3c
+  data.tar.gz: 48a7733a1a6a7ff5ce9db5ae9a3ab11a4ef29e40baa5d0a4fbd9c4f8d97d34aa
 SHA512:
-  metadata.gz: 786be93811a076e9736a02fccafab91eac37e4d6eab27cdafffc41743ed93e910c84cf073fde0195b7e51e47e1d6868b9673d7c91fbd792ac17428afeabcf68f
-  data.tar.gz: 472cc7b075befe6502a6f1f543565941cc9d1ffd3c7e5f66f2f21bfed82597cc0a0ad42b8e0f3319321fa9554fbd44a9d375b9a7f226231c7980d8782e5dd23a
+  metadata.gz: 01dbf93e7c6f423aefef85196a0d4a4ea2aa3e7b967761d386326b8d6279d8990864dae261bb642040288e51496b8b9270fbadf2a7794a97d85788e57f7d4cf4
+  data.tar.gz: 71c4254b20d51d8df265d65628235d2fe3d13b6105a917449ecb5e00a280f11956412cea0364fe03957a7e5c09f704724b42ecf68c0419a048711cc7b6426c8f

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,15 +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_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/node.rb

@@ -5,8 +5,8 @@ module Parser
 
     ##
     # {Parser::AST::Node} contains information about a single AST node and its
-    # child nodes. It extends the basic [AST::Node](http://rdoc.info/gems/ast/AST/Node)
-    # class provided by gem [ast](http://rdoc.info/gems/ast).
+    # child nodes. It extends the basic [AST::Node](https://www.rubydoc.info/gems/ast/AST/Node)
+    # class provided by gem [ast](https://www.rubydoc.info/gems/ast).
     #
     # @api public
     #

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

@@ -538,29 +538,23 @@ module Parser
     end
 
     def associate(begin_t, pairs, end_t)
-      0.upto(pairs.length - 1) do |i|
-        (i + 1).upto(pairs.length - 1) do |j|
-          key1, = *pairs[i]
-          key2, = *pairs[j]
-
-          do_warn = false
-
-          # keys have to be simple nodes, MRI ignores equal composite keys like
-          # `{ a(1) => 1, a(1) => 1 }`
-          case key1.type
-          when :sym, :str, :int, :float
-            if key1 == key2
-              do_warn = true
-            end
-          when :rational, :complex, :regexp
-            if @parser.version >= 31 && key1 == key2
-              do_warn = true
-            end
-          end
+      key_set = Set.new
 
-          if do_warn
-            diagnostic :warning, :duplicate_hash_key, nil, key2.loc.expression
-          end
+      pairs.each do |pair|
+        next unless pair.type.eql?(:pair)
+
+        key, = *pair
+
+        case key.type
+        when :sym, :str, :int, :float
+        when :rational, :complex, :regexp
+          next unless @parser.version >= 31
+        else
+          next
+        end
+
+        unless key_set.add?(key)
+          diagnostic :warning, :duplicate_hash_key, nil, key.loc.expression
         end
       end
 
@@ -600,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
 
@@ -660,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
@@ -1696,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))
 
@@ -2251,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

@@ -3,7 +3,7 @@
 module Parser
   class << self
     def warn_syntax_deviation(feature, version)
-      warn "warning: parser/current is loading #{feature}, which recognizes" \
+      warn "warning: parser/current is loading #{feature}, which recognizes " \
         "#{version}-compliant syntax, but you are running #{RUBY_VERSION}.\n" \
         "Please see https://github.com/whitequark/parser#compatibility-with-ruby-mri."
     end
@@ -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,49 +71,67 @@ module Parser
       warn_syntax_deviation 'parser/ruby26', current_version
     end
 
-    require 'parser/ruby26'
+    require_relative 'ruby26'
     CurrentRuby = Ruby26
 
   when /^2\.7\./
-    current_version = '2.7.7'
+    current_version = '2.7.8'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby27', current_version
     end
 
-    require 'parser/ruby27'
+    require_relative 'ruby27'
     CurrentRuby = Ruby27
 
   when /^3\.0\./
-    current_version = '3.0.5'
+    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.3'
+    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.0-dev'
+    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.2'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby33', current_version
+    end
+
+    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/ruby31', '3.1.x'
-    require 'parser/ruby31'
-    CurrentRuby = Ruby31
+    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