parser 3.0.1.0 → 3.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dced4877039fb67469d83e8d10c513c2ca05cc09878b487e60a29a9795bef7f1
-  data.tar.gz: c7827038c9b8acfe02c7878e3f74c46184106ff1939a8fa8f0eb2d60c7560cc4
+  metadata.gz: 77c9eebb09451e4a14705adad346538d2abe88fee102045ea98d041cf39f07d8
+  data.tar.gz: 67e81c519a542b6f8927a3e076280cf1c6fb35c0c5c738fa9f44efefb8a436b5
 SHA512:
-  metadata.gz: 6c1bc36f5b08e5ccb99d6dc7774a7e7041709b14d0ddecaa2aa63cacabd9e1be39ce28fbceb9c9c90512cd79d19e20d163386621694a9265fcdf6085c82aaf5e
-  data.tar.gz: 4c3f661941751ea6f66b2e1089fd5d53125e12b0c4819d7e80123143d1798736ba5169cc09b4f3be1dff50c56d8a609355c751c20b1236a3d7288c6d9fee9875
+  metadata.gz: ad73beaf5b3110282c673bbbb2566fad13ddbbe92ffa24f52eca02efc8a83f56c504d84dbc4e571ff42a3af6f7762a517c19654c6942775b26330a25ff67fc9b
+  data.tar.gz: d17eaef98d39bfe83f09ed5a7fbcd6bf94eff3d9b85b23f1fd12732f40c965796910184eca6fe9686a62a6f152566c2a72d473a338a7f9903794676d56ca831b

data/lib/parser/all.rb

@@ -11,3 +11,4 @@ require 'parser/ruby25'
 require 'parser/ruby26'
 require 'parser/ruby27'
 require 'parser/ruby30'
+require 'parser/ruby31'

data/lib/parser/builders/default.rb

@@ -161,7 +161,7 @@ module Parser
       #
       # ```
       # (send nil :foo
-      #   (hash
+      #   (kwargs
       #     (pair
       #       (sym :a)
       #       (int 42))
@@ -518,12 +518,52 @@ module Parser
       n(:pair, [ key, value ], pair_map)
     end
 
+    def pair_label(key_t)
+      key_l = loc(key_t)
+      value_l = key_l.adjust(end_pos: -1)
+
+      label = value(key_t)
+      value =
+        if label =~ /\A[[:lower:]]/
+          n(:ident, [ label.to_sym ], Source::Map::Variable.new(value_l))
+        else
+          n(:const, [ nil, label.to_sym ], Source::Map::Constant.new(nil, value_l, value_l))
+        end
+      pair_keyword(key_t, accessible(value))
+    end
+
     def kwsplat(dstar_t, arg)
       n(:kwsplat, [ arg ],
         unary_op_map(dstar_t, arg))
     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
+
+          if do_warn
+            diagnostic :warning, :duplicate_hash_key, nil, key2.loc.expression
+          end
+        end
+      end
+
       n(:hash, [ *pairs ],
         collection_map(begin_t, pairs, end_t))
     end
@@ -608,19 +648,29 @@ module Parser
       when :ident
         name, = *node
 
-        if @parser.static_env.declared?(name)
-          if name.to_s == parser.current_arg_stack.top
-            diagnostic :error, :circular_argument_reference,
-                       { :var_name => name.to_s }, node.loc.expression
-          end
+        if %w[? !].any? { |c| name.to_s.end_with?(c) }
+          diagnostic :error, :invalid_id_to_get,
+                     { :identifier => name.to_s }, node.loc.expression
+        end
 
-          node.updated(:lvar)
-        else
-          name, = *node
-          n(:send, [ nil, name ],
+        # Numbered parameters are not declared anywhere,
+        # so they take precedence over method calls in numblock contexts
+        if @parser.version >= 27 && @parser.try_declare_numparam(node)
+          return node.updated(:lvar)
+        end
+
+        unless @parser.static_env.declared?(name)
+          return n(:send, [ nil, name ],
             var_send_map(node))
         end
 
+        if name.to_s == parser.current_arg_stack.top
+          diagnostic :error, :circular_argument_reference,
+                     { :var_name => name.to_s }, node.loc.expression
+        end
+
+        node.updated(:lvar)
+
       else
         node
       end
@@ -683,6 +733,17 @@ module Parser
 
         node.updated(:lvasgn)
 
+      when :match_var
+        name, = *node
+
+        var_name = node.children[0].to_s
+        name_loc = node.loc.expression
+
+        check_assignment_to_numparam(var_name, name_loc)
+        check_reserved_for_numparam(var_name, name_loc)
+
+        node
+
       when :nil, :self, :true, :false,
            :__FILE__, :__LINE__, :__ENCODING__
         diagnostic :error, :invalid_assignment, nil, node.loc.expression
@@ -818,8 +879,14 @@ module Parser
 
     def args(begin_t, args, end_t, check_args=true)
       args = check_duplicate_args(args) if check_args
-      n(:args, args,
-        collection_map(begin_t, args, end_t))
+      validate_no_forward_arg_after_restarg(args)
+
+      map = collection_map(begin_t, args, end_t)
+      if !self.class.emit_forward_arg && args.length == 1 && args[0].type == :forward_arg
+        n(:forward_args, [], map)
+      else
+        n(:args, args, map)
+      end
     end
 
     def numargs(max_numparam)
@@ -906,9 +973,12 @@ module Parser
     end
 
     def blockarg(amper_t, name_t)
-      check_reserved_for_numparam(value(name_t), loc(name_t))
+      if !name_t.nil?
+        check_reserved_for_numparam(value(name_t), loc(name_t))
+      end
 
-      n(:blockarg, [ value(name_t).to_sym ],
+      arg_name = name_t ? value(name_t).to_sym : nil
+      n(:blockarg, [ arg_name ],
         arg_prefix_map(amper_t, name_t))
     end
 
@@ -1683,6 +1753,21 @@ module Parser
       end
     end
 
+    def validate_no_forward_arg_after_restarg(args)
+      restarg = nil
+      forward_arg = nil
+      args.each do |arg|
+        case arg.type
+        when :restarg then restarg = arg
+        when :forward_arg then forward_arg = arg
+        end
+      end
+
+      if !forward_arg.nil? && !restarg.nil?
+        diagnostic :error, :forward_arg_after_restarg, nil, forward_arg.loc.expression, [restarg.loc.expression]
+      end
+    end
+
     def check_assignment_to_numparam(name, loc)
       # MRI < 2.7 treats numbered parameters as regular variables
       # and so it's allowed to perform assignments like `_1 = 42`.
@@ -1724,7 +1809,7 @@ module Parser
     end
 
     def check_lvar_name(name, loc)
-      if name =~ /\A[[[:lower:]]|_][[[:alnum:]]_]*\z/
+      if name =~ /\A[[[:lower:]]_][[[:alnum:]]_]*\z/
         # OK
       else
         diagnostic :error, :lvar_name, { name: name }, loc

data/lib/parser/context.rb

@@ -9,6 +9,9 @@ module Parser
   # + :sclass - in the singleton class body (class << obj; end)
   # + :def - in the method body (def m; end)
   # + :defs - in the singleton method body (def self.m; end)
+  # + :def_open_args - in the arglist of the method definition
+  #                    keep in mind that it's set **only** after reducing the first argument,
+  #                    if you need to handle the first argument check `lex_state == expr_fname`
   # + :block - in the block body (tap {})
   # + :lambda - in the lambda body (-> {})
   #
@@ -64,5 +67,9 @@ module Parser
     def in_dynamic_block?
       in_block? || in_lambda?
     end
+
+    def in_def_open_args?
+      @stack.last == :def_open_args
+    end
   end
 end

data/lib/parser/current.rb

@@ -66,7 +66,7 @@ module Parser
     CurrentRuby = Ruby25
 
   when /^2\.6\./
-    current_version = '2.6.7'
+    current_version = '2.6.9'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby26', current_version
     end
@@ -75,7 +75,7 @@ module Parser
     CurrentRuby = Ruby26
 
   when /^2\.7\./
-    current_version = '2.7.3'
+    current_version = '2.7.5'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby27', current_version
     end
@@ -84,7 +84,7 @@ module Parser
     CurrentRuby = Ruby27
 
   when /^3\.0\./
-    current_version = '3.0.1'
+    current_version = '3.0.3'
     if RUBY_VERSION != current_version
       warn_syntax_deviation 'parser/ruby30', current_version
     end
@@ -92,6 +92,15 @@ module Parser
     require 'parser/ruby30'
     CurrentRuby = Ruby30
 
+  when /^3\.1\./
+    current_version = '3.1.0-dev'
+    if RUBY_VERSION != current_version
+      warn_syntax_deviation 'parser/ruby31', current_version
+    end
+
+    require 'parser/ruby31'
+    CurrentRuby = Ruby31
+
   else # :nocov:
     # Keep this in sync with released Ruby.
     warn_syntax_deviation 'parser/ruby30', '3.0.x'

data/lib/parser/lexer/dedenter.rb

@@ -38,7 +38,13 @@ module Parser
       # Prevent the following error when processing binary encoded source.
       # "\xC0".split # => ArgumentError (invalid byte sequence in UTF-8)
       lines = string.force_encoding(Encoding::BINARY).split("\\\n")
-      lines.map! {|s| s.force_encoding(original_encoding) }
+      if lines.length == 1
+        # If the line continuation sequence was found but there is no second
+        # line, it was not really a line continuation and must be ignored.
+        lines = [string]
+      else
+        lines.map! {|s| s.force_encoding(original_encoding) }
+      end
 
       if @at_line_begin
         lines_to_dedent = lines