+ ruby33.y: extract arg_splat rule. (#981)

This commit tracks upstream commit ruby/ruby@11c2aa0.
whitequark · Dec 29, 2023 · a80f672 · a80f672
1 parent 7c9498f
commit a80f672
Showing 1 changed file with 11 additions and 17 deletions.
diff --git a/lib/parser/ruby33.y b/lib/parser/ruby33.y
@@ -1116,33 +1116,27 @@ rule
                     {
                       result = [ val[0] ]
                     }
-                | tSTAR arg_value
-                    {
-                      result = [ @builder.splat(val[0], val[1]) ]
-                    }
-                | tSTAR
-                    {
-                      if !@static_env.declared_anonymous_restarg?
-                        diagnostic :error, :no_anonymous_restarg, nil, val[0]
-                      end
-
-                      result = [ @builder.forwarded_restarg(val[0]) ]
-                    }
+                | arg_splat
                 | args tCOMMA arg_value
                     {
                       result = val[0] << val[2]
                     }
-                | args tCOMMA tSTAR arg_value
+                | args tCOMMA arg_splat
                     {
-                      result = val[0] << @builder.splat(val[2], val[3])
+                      result = val[0].concat(val[2])
+                    }
+
+       arg_splat: tSTAR arg_value
+                    {
+                      result = [ @builder.splat(val[0], val[1]) ]
                     }
-                | args tCOMMA tSTAR
+                | tSTAR
                     {
                       if !@static_env.declared_anonymous_restarg?
-                        diagnostic :error, :no_anonymous_restarg, nil, val[2]
+                        diagnostic :error, :no_anonymous_restarg, nil, val[0]
                       end
 
-                      result = val[0] << @builder.forwarded_restarg(val[2])
+                      result = [ @builder.forwarded_restarg(val[0]) ]
                     }
 
         mrhs_arg: mrhs