From 2581de112c1957dc4b5852e54337551dc8972c99 Mon Sep 17 00:00:00 2001
From: Shugo Maeda <shugo@ruby-lang.org>
Date: Thu, 15 Dec 2022 15:12:33 +0900
Subject: Disallow mixed usage of ... and */**

[Feature #19134]
---
 parse.y | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index 2caea0f138..bd3251e4e1 100644
--- a/parse.y
+++ b/parse.y
@@ -943,6 +943,8 @@ static void numparam_pop(struct parser_params *p, NODE *prev_inner);
 #define idFWD_REST   '*'
 #define idFWD_KWREST idPow /* Use simple "**", as tDSTAR is "**arg" */
 #define idFWD_BLOCK  '&'
+#define idFWD_ALL    idDot3
+#define FORWARD_ARGS_WITH_RUBY2_KEYWORDS
 
 #define RE_OPTION_ONCE (1<<16)
 #define RE_OPTION_ENCODING_SHIFT 8
@@ -3150,7 +3152,8 @@ args		: arg_value
 		    }
 		| tSTAR
 		    {
-                        if (!local_id(p, idFWD_REST)) {
+                        if (!local_id(p, idFWD_REST) ||
+                            local_id(p, idFWD_ALL)) {
                             compile_error(p, "no anonymous rest parameter");
                         }
 		    /*%%%*/
@@ -3174,7 +3177,8 @@ args		: arg_value
 		    }
 		| args ',' tSTAR
 		    {
-                        if (!local_id(p, idFWD_REST)) {
+                        if (!local_id(p, idFWD_REST) ||
+                            local_id(p, idFWD_ALL)) {
                             compile_error(p, "no anonymous rest parameter");
                         }
 		    /*%%%*/
@@ -5601,7 +5605,11 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg opt_args_tail
 args_forward	: tBDOT3
 		    {
 		    /*%%%*/
+#ifdef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
+			$$ = 0;
+#else
 			$$ = idFWD_KWREST;
+#endif
 		    /*% %*/
 		    /*% ripper: args_forward! %*/
 		    }
@@ -6044,7 +6052,8 @@ assoc		: arg_value tASSOC arg_value
 		    }
 		| tDSTAR
 		    {
-                        if (!local_id(p, idFWD_KWREST)) {
+                        if (!local_id(p, idFWD_KWREST) ||
+                            local_id(p, idFWD_ALL)) {
                             compile_error(p, "no anonymous keyword rest parameter");
                         }
 		    /*%%%*/
@@ -12574,6 +12583,12 @@ new_args(struct parser_params *p, NODE *pre_args, NODE *opt_args, ID rest_arg, N
 
     args->opt_args       = opt_args;
 
+#ifdef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
+    args->ruby2_keywords = args->forwarding;
+#else
+    args->ruby2_keywords = 0;
+#endif
+
     p->ruby_sourceline = saved_line;
     nd_set_loc(tail, loc);
 
@@ -13256,9 +13271,7 @@ local_id(struct parser_params *p, ID id)
 static int
 check_forwarding_args(struct parser_params *p)
 {
-    if (local_id(p, idFWD_REST) &&
-        local_id(p, idFWD_KWREST) &&
-        local_id(p, idFWD_BLOCK)) return TRUE;
+    if (local_id(p, idFWD_ALL)) return TRUE;
     compile_error(p, "unexpected ...");
     return FALSE;
 }
@@ -13267,8 +13280,11 @@ static void
 add_forwarding_args(struct parser_params *p)
 {
     arg_var(p, idFWD_REST);
+#ifndef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
     arg_var(p, idFWD_KWREST);
+#endif
     arg_var(p, idFWD_BLOCK);
+    arg_var(p, idFWD_ALL);
 }
 
 #ifndef RIPPER
@@ -13276,10 +13292,14 @@ static NODE *
 new_args_forward_call(struct parser_params *p, NODE *leading, const YYLTYPE *loc, const YYLTYPE *argsloc)
 {
     NODE *rest = NEW_LVAR(idFWD_REST, loc);
+#ifndef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
     NODE *kwrest = list_append(p, NEW_LIST(0, loc), NEW_LVAR(idFWD_KWREST, loc));
+#endif
     NODE *block = NEW_BLOCK_PASS(NEW_LVAR(idFWD_BLOCK, loc), loc);
     NODE *args = leading ? rest_arg_append(p, leading, rest, argsloc) : NEW_SPLAT(rest, loc);
+#ifndef FORWARD_ARGS_WITH_RUBY2_KEYWORDS
     args = arg_append(p, args, new_hash(p, kwrest, loc), loc);
+#endif
     return arg_blk_pass(args, block);
 }
 #endif
-- 
cgit v1.2.1