1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix splat assigns with no lefties

Browse Source 
We still need to emit an expand array even if there's no "left side"
variables

Fixes: https://github.com/ruby/prism/issues/2153
This commit is contained in:
Aaron Patterson 2024-01-12 12:16:13 -08:00 committed by Aaron Patterson
parent aad246feba
commit 2c27a3a0dd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
prism_compile.c
View File

@ -5137,12 +5137,10 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
PM_NODE_TYPE_P(cast->rest, PM_SPLAT_NODE) && PM_NODE_TYPE_P(cast->rest, PM_SPLAT_NODE) &&
(((pm_splat_node_t *)cast->rest)->expression)); (((pm_splat_node_t *)cast->rest)->expression));
if (cast->lefts.size) { int flag = (int) (bool) cast->rights.size || has_rest_expression;
int flag = (int) (bool) cast->rights.size || has_rest_expression; ADD_INSN2(ret, &dummy_line_node, expandarray, INT2FIX(cast->lefts.size), INT2FIX(flag));
ADD_INSN2(ret, &dummy_line_node, expandarray, INT2FIX(cast->lefts.size), INT2FIX(flag)); for (size_t index = 0; index < cast->lefts.size; index++) {
for (size_t index = 0; index < cast->lefts.size; index++) { PM_COMPILE_NOT_POPPED(cast->lefts.nodes[index]);
PM_COMPILE_NOT_POPPED(cast->lefts.nodes[index]);
}
} }
if (has_rest_expression) { if (has_rest_expression) {

4
test/ruby/test_compile_prism.rb
View File

@ -1330,6 +1330,10 @@ module Prism
assert_prism_eval("def self.foo(_a, _a); _a; end; foo(1, 2)") assert_prism_eval("def self.foo(_a, _a); _a; end; foo(1, 2)")
end end
def test_splat_params_with_no_lefties
assert_prism_eval("def self.foo(v, (*)); v; end; foo(1, [2, 3, 4])")
end
def test_method_parameters def test_method_parameters
assert_prism_eval(<<-CODE) assert_prism_eval(<<-CODE)
def self.prism_test_method_parameters(a, b=1, *c, d:, e: 2, **f, &g) def self.prism_test_method_parameters(a, b=1, *c, d:, e: 2, **f, &g)

2
tool/prism_btests
View File

@ -20,7 +20,7 @@
../src/bootstraptest/test_string.rb ../src/bootstraptest/test_string.rb
../src/bootstraptest/test_struct.rb ../src/bootstraptest/test_struct.rb
../src/bootstraptest/test_thread.rb ../src/bootstraptest/test_thread.rb
# ../src/bootstraptest/test_block.rb ../src/bootstraptest/test_block.rb
# ../src/bootstraptest/test_exception.rb # ../src/bootstraptest/test_exception.rb
# ../src/bootstraptest/test_flow.rb # ../src/bootstraptest/test_flow.rb
# ../src/bootstraptest/test_insns.rb # ../src/bootstraptest/test_insns.rb