ruby_parser 3.16.0 → 3.17.0

data/lib/ruby30_parser.y

@@ -1009,6 +1009,24 @@ rule
                       _, args, _ = val
                       result = args
                     }
+                | tLPAREN2 args tCOMMA args_forward rparen
+                    {
+                      yyerror "Unexpected ..." unless
+                        self.lexer.is_local_id(:"*")  &&
+                        self.lexer.is_local_id(:"**") &&
+                        self.lexer.is_local_id(:"&")
+
+                      result = call_args val
+                    }
+                | tLPAREN2 args_forward rparen
+                    {
+                      yyerror "Unexpected ..." unless
+                        self.lexer.is_local_id(:"*")  &&
+                        self.lexer.is_local_id(:"**") &&
+                        self.lexer.is_local_id(:"&")
+
+                      result = call_args val
+                    }
 
   opt_paren_args: none
                 | paren_args
@@ -2286,6 +2304,20 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
        f_arglist: tLPAREN2 f_args rparen
                     {
                       result = val[1]
+                      self.lexer.lex_state = EXPR_BEG
+                      self.lexer.command_start = true
+                    }
+                | tLPAREN2 f_arg tCOMMA args_forward rparen
+                    {
+                      result = args val
+
+                      self.lexer.lex_state = EXPR_BEG
+                      self.lexer.command_start = true
+                    }
+                | tLPAREN2 args_forward rparen
+                    {
+                      result = args val
+
                       self.lexer.lex_state = EXPR_BEG
                       self.lexer.command_start = true
                     }
@@ -2388,6 +2420,11 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                       result = args val
                     }
 
+    args_forward: tBDOT3
+                    {
+                      result = s(:forward_args).line lexer.lineno
+                    }
+
        f_bad_arg: tCONSTANT
                     {
                       yyerror "formal argument cannot be a constant"
@@ -2516,6 +2553,7 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                 | kwrest_mark
                     {
                       result = :"**"
+                      self.env[result] = :lvar
                     }
 
            f_opt: f_arg_asgn tEQL arg_value

data/lib/ruby_lexer.rex.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #--
 # This file is automatically generated. Do not modify it.
-# Generated by: oedipus_lex version 2.5.2.
+# Generated by: oedipus_lex version 2.5.3.
 # Source: lib/ruby_lexer.rex
 #++
 

data/lib/ruby_parser.yy

@@ -1066,6 +1066,26 @@ rule
                       _, args, _ = val
                       result = args
                     }
+#if V >= 27
+                | tLPAREN2 args tCOMMA args_forward rparen
+                    {
+                      yyerror "Unexpected ..." unless
+                        self.lexer.is_local_id(:"*")  &&
+                        self.lexer.is_local_id(:"**") &&
+                        self.lexer.is_local_id(:"&")
+
+                      result = call_args val
+                    }
+                | tLPAREN2 args_forward rparen
+                    {
+                      yyerror "Unexpected ..." unless
+                        self.lexer.is_local_id(:"*")  &&
+                        self.lexer.is_local_id(:"**") &&
+                        self.lexer.is_local_id(:"&")
+
+                      result = call_args val
+                    }
+#endif
 
   opt_paren_args: none
                 | paren_args
@@ -2366,6 +2386,22 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                       self.lexer.lex_state = EXPR_BEG
                       self.lexer.command_start = true
                     }
+#if V >= 27
+                | tLPAREN2 f_arg tCOMMA args_forward rparen
+                    {
+                      result = args val
+
+                      self.lexer.lex_state = EXPR_BEG
+                      self.lexer.command_start = true
+                    }
+                | tLPAREN2 args_forward rparen
+                    {
+                      result = args val
+
+                      self.lexer.lex_state = EXPR_BEG
+                      self.lexer.command_start = true
+                    }
+#endif
                 |   {
                       result = self.in_kwarg
                       self.in_kwarg = true
@@ -2465,6 +2501,13 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                       result = args val
                     }
 
+#if V >= 27
+    args_forward: tBDOT3
+                    {
+                      result = s(:forward_args).line lexer.lineno
+                    }
+#endif
+
        f_bad_arg: tCONSTANT
                     {
                       yyerror "formal argument cannot be a constant"
@@ -2613,6 +2656,7 @@ keyword_variable: kNIL      { result = s(:nil).line lexer.lineno }
                 | kwrest_mark
                     {
                       result = :"**"
+                      self.env[result] = :lvar
                     }
 
 #if V == 20

data/lib/ruby_parser_extras.rb

@@ -160,6 +160,12 @@ module RubyParserStuff
         case arg.sexp_type
         when :args, :block, :array, :call_args then # HACK call_args mismatch
           result.concat arg.sexp_body
+        when :forward_args then
+          self.env[:*]  = :lvar # TODO: arg_var(p, idFWD_REST) ?
+          self.env[:**] = :lvar
+          self.env[:&]  = :lvar
+
+          result << arg
         when :block_arg then
           result << :"&#{arg.last}"
         when :shadow then
@@ -311,7 +317,7 @@ module RubyParserStuff
         end
       when Symbol then
         result << arg
-      when ",", nil then
+      when ",", nil, "(" then
         # ignore
       else
         raise "unhandled: #{arg.inspect} in #{args.inspect}"

data/test/test_ruby_parser.rb

@@ -4138,6 +4138,43 @@ end
 
 module TestRubyParserShared27Plus
   include TestRubyParserShared26Plus
+
+  def test_defn_forward_args
+    rb = "def a(...); b(...); end"
+    pt = s(:defn, :a, s(:args, s(:forward_args)),
+          s(:call, nil, :b, s(:forward_args)))
+
+    assert_parse_line rb, pt, 1
+  end
+
+  def test_defn_arg_forward_args
+    rb = "def a(x, ...); b(x, ...); end"
+    pt = s(:defn, :a, s(:args, :x, s(:forward_args)),
+           s(:call, nil, :b, s(:lvar, :x), s(:forward_args)))
+
+    assert_parse_line rb, pt, 1
+  end
+
+  def test_defn_args_forward_args
+    rb = "def a(x, y, z, ...); b(:get, z, ...); end"
+    pt = s(:defn, :a, s(:args, :x, :y, :z, s(:forward_args)),
+           s(:call, nil, :b, s(:lit, :get), s(:lvar, :z),
+             s(:forward_args)))
+
+    assert_parse_line rb, pt, 1
+  end
+
+  def test_call_forward_args_outside_method_definition
+    rb = "b(...)"
+
+    assert_syntax_error rb, "Unexpected ..."
+  end
+
+  def test_call_arg_forward_args_outside_method_definition
+    rb = "b(x, ...)"
+
+    assert_syntax_error rb, "Unexpected ..."
+  end
 end
 
 module TestRubyParserShared30Plus
@@ -4437,7 +4474,6 @@ class TestRubyParserV26 < RubyParserTestCase
 
     assert_parse_line rb, pt, 1
   end
-
 end
 
 class TestRubyParserV27 < RubyParserTestCase

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_parser
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.17.0
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   d/AHw/kcnU6iuMUoJEcGiJd4gVCTn1l3cDcIvxakGslCA88Jubw0Sqatan0TnC9g
   KToW560QIey7SPfHWduzFJnV
   -----END CERTIFICATE-----
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sexp_processor