[Feature #19370] Blocks without anonymous parameters should not affect

nobu · nobu · commit 596db9c1f486 · 2023-12-25T18:28:21.000+09:00
diff --git a/parse.y b/parse.y
@@ -15070,13 +15070,13 @@ forwarding_arg_check(struct parser_params *p, ID arg, ID all, const char *var)
     args = p->lvtbl->args;
 
     while (vars && !DVARS_TERMINAL_P(vars->prev)) {
+        conflict |= (vtable_included(args, arg) && !(all && vtable_included(args, all)));
         vars = vars->prev;
         args = args->prev;
-        conflict |= (vtable_included(args, arg) && !(all && vtable_included(args, all)));
     }
 
     bool found = false;
-    if (vars && vars->prev == DVARS_INHERIT) {
+    if (vars && vars->prev == DVARS_INHERIT && !found) {
         found = (rb_local_defined(arg, p->parent_iseq) &&
                  !(all && rb_local_defined(all, p->parent_iseq)));
     }
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
@@ -77,6 +77,7 @@ def test_script_lines_encoding
   def test_anonymous_block_forwarding
     assert_syntax_error("def b; c(&); end", /no anonymous block parameter/)
     assert_syntax_error("def b(&) ->(&) {c(&)} end", /anonymous block parameter is also used/)
+    assert_valid_syntax("def b(&) ->() {c(&)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
       def b(&); c(&) end
@@ -147,6 +148,9 @@ def test_anonymous_rest_forwarding
     assert_syntax_error("def b(*) ->(*) {c(*)} end", /anonymous rest parameter is also used/)
     assert_syntax_error("def b(a, *) ->(*) {c(1, *)} end", /anonymous rest parameter is also used/)
     assert_syntax_error("def b(*) ->(a, *) {c(*)} end", /anonymous rest parameter is also used/)
+    assert_valid_syntax("def b(*) ->() {c(*)} end")
+    assert_valid_syntax("def b(a, *) ->() {c(1, *)} end")
+    assert_valid_syntax("def b(*) ->(a) {c(*)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
       def b(*); c(*) end
@@ -163,6 +167,9 @@ def test_anonymous_keyword_rest_forwarding
     assert_syntax_error("def b(**) ->(**) {c(**)} end", /anonymous keyword rest parameter is also used/)
     assert_syntax_error("def b(k:, **) ->(**) {c(k: 1, **)} end", /anonymous keyword rest parameter is also used/)
     assert_syntax_error("def b(**) ->(k:, **) {c(**)} end", /anonymous keyword rest parameter is also used/)
+    assert_valid_syntax("def b(**) ->() {c(**)} end")
+    assert_valid_syntax("def b(k:, **) ->() {c(k: 1, **)} end")
+    assert_valid_syntax("def b(**) ->(k:) {c(**)} end")
     assert_separately([], "#{<<-"begin;"}\n#{<<-'end;'}")
     begin;
       def b(**); c(**) end

Original file line number	Diff line number	Diff line change
`@@ -15070,13 +15070,13 @@ forwarding_arg_check(struct parser_params p, ID arg, ID all, const char var)`
`15070`	`15070`	`args = p->lvtbl->args;`
`15071`	`15071`
`15072`	`15072`	`while (vars && !DVARS_TERMINAL_P(vars->prev)) {`
	`15073`	`+ conflict \|= (vtable_included(args, arg) && !(all && vtable_included(args, all)));`
`15073`	`15074`	`vars = vars->prev;`
`15074`	`15075`	`args = args->prev;`
`15075`		`- conflict \|= (vtable_included(args, arg) && !(all && vtable_included(args, all)));`
`15076`	`15076`	`}`
`15077`	`15077`
`15078`	`15078`	`bool found = false;`
`15079`		`- if (vars && vars->prev == DVARS_INHERIT) {`
	`15079`	`+ if (vars && vars->prev == DVARS_INHERIT && !found) {`
`15080`	`15080`	`found = (rb_local_defined(arg, p->parent_iseq) &&`
`15081`	`15081`	`!(all && rb_local_defined(all, p->parent_iseq)));`
`15082`	`15082`	`}`