Merge pull request #3119 from eileencodes/fix-3112

Fix 3112 - disallow commas after block arg
ruby · Oct 1, 2024 · 3eacea4 · 3eacea4
2 parents b44616d + 544df58
commit 3eacea4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/src/prism.c b/src/prism.c
@@ -14127,9 +14127,6 @@ parse_arguments(pm_parser_t *parser, pm_arguments_t *arguments, bool accepts_for
     bool parsed_forwarding_arguments = false;
 
     while (!match1(parser, PM_TOKEN_EOF)) {
-        if (parsed_block_argument) {
-            pm_parser_err_current(parser, PM_ERR_ARGUMENT_AFTER_BLOCK);
-        }
         if (parsed_forwarding_arguments) {
             pm_parser_err_current(parser, PM_ERR_ARGUMENT_AFTER_FORWARDING_ELLIPSES);
         }
@@ -14178,6 +14175,10 @@ parse_arguments(pm_parser_t *parser, pm_arguments_t *arguments, bool accepts_for
                     arguments->block = argument;
                 }
 
+                if (match1(parser, PM_TOKEN_COMMA)) {
+                    pm_parser_err_current(parser, PM_ERR_ARGUMENT_AFTER_BLOCK);
+                }
+
                 parsed_block_argument = true;
                 break;
             }

diff --git a/test/prism/errors/arguments_after_block.txt b/test/prism/errors/arguments_after_block.txt
@@ -1,3 +1,17 @@
 a(&block, foo)
-          ^~~ unexpected argument after a block argument
+        ^ unexpected argument after a block argument
+a(&block,)
+        ^ unexpected argument after a block argument
+a.(&block,)
+         ^ unexpected argument after a block argument
+a[&block,]
+        ^ unexpected argument after a block argument
+def a(&block)
+  p(&block,)
+          ^ unexpected argument after a block argument
+  a.(&block,)
+           ^ unexpected argument after a block argument
+  a[&block,]
+          ^ unexpected argument after a block argument
+end