diff options
| -rw-r--r-- | bootstraptest/test_method.rb | 15 | ||||
| -rw-r--r-- | prism_compile.c | 8 |
2 files changed, 23 insertions, 0 deletions
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 41823b5007..d8a8effbaf 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -1419,3 +1419,18 @@ assert_equal 'ok', %q{ "ok" end } + +assert_equal '[1, 2, 3]', %q{ + def target(*args) = args + def x = [1] + def forwarder(...) = target(*x, 2, ...) + forwarder(3).inspect +}, '[Bug #21832] post-splat args before forwarding' + +assert_equal 'ok', <<~RUBY + def test(*, kw: false) + "ok" + end + + test +RUBY diff --git a/prism_compile.c b/prism_compile.c index 79c944d998..9d6a8141bd 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -1821,6 +1821,10 @@ pm_setup_args_core(const pm_arguments_node_t *arguments_node, const pm_node_t *b // foo(*a, b, c: :d) // foo(*a, b, **c) // + // If the next node is a forwarding argument: + // + // foo(*a, b, ...) + // // If the next node is NULL (we have hit the end): // // foo(*a, b) @@ -1843,6 +1847,10 @@ pm_setup_args_core(const pm_arguments_node_t *arguments_node, const pm_node_t *b PUSH_INSN(ret, location, concatarray); break; } + case PM_FORWARDING_ARGUMENTS_NODE: { + PUSH_INSN1(ret, location, pushtoarray, INT2FIX(post_splat_counter)); + break; + } default: break; } |