parser 3.2.2.3 → 3.3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6df2e6383fb2571b7b534703d56589f4ee58235cf8579eb42409915bad548bf1
-  data.tar.gz: ae96b9894891d64599e0253d35a274f41e17d5a7f1d18c2b121faedd1d5ee978
+  metadata.gz: 780dd5ff7826fc0f5732ce77431124b80780db4aba31bb969778f856f3f3f856
+  data.tar.gz: 597eb758eb6f50230e1541bd30b317b43ef6efa060d1ae276f556e90f23ac50e
 SHA512:
-  metadata.gz: a225b9a96a99999e59b4d4c61f056e7501073a9b69bed0987f6ea7272f38efe7aaae50901cfbf3074c4de6174622bf9282ecd8b1b915ecc9aed462ebde2e6faf
-  data.tar.gz: 17116f52ec7abc4f13fd1fecf9c0edf0c8a0fc07294c1b60eb5c7c113571788a5ef3c077e7e774671a490d8c606f0dce52723f84cb9752ea580ee1d764c16066
+  metadata.gz: 0c3ce1ff689c04a1bbdc85b96bca0e14d5a7db8f6226436bc7782753827d3db872d311d34ab53a25649e36d7ef9f41c8c88e739a4b34a0caa1ca8a2e703801cb
+  data.tar.gz: 489be4885d7f1c3d011898b9790140b6aa4a1cca356dfb2a7f488d73fc3050ac08e7182bcb6a91f01a0167542ca388da3c71b5512bbdbae155163eaa496ac2ef

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

@@ -111,7 +111,7 @@ module Parser
     CurrentRuby = Ruby32
 
   when /^3\.3\./
-    current_version = '3.3.0-dev'
+    current_version = '3.3.0'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby33', current_version
     end
@@ -121,8 +121,8 @@ module Parser
 
   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 'parser/ruby33'
+    CurrentRuby = Ruby33
   end
 end

data/lib/parser/lexer/literal.rb

@@ -5,6 +5,7 @@ module Parser
 
   class Lexer::Literal
     DELIMITERS = { '(' => ')', '[' => ']', '{' => '}', '<' => '>' }
+    SPACE = ' '.ord
 
     TYPES = {
     # type       start token     interpolate?
@@ -234,7 +235,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.delete_suffix(@end_delim).bytes.all? { |c| c == SPACE }
+      elsif @indent
         @end_delim == delimiter.lstrip
       else
         @end_delim == delimiter