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

[PRISM] Fix incorrect ordering of MultiTargetNode

Browse Source 
Fixes ruby/prism#2218.
This commit is contained in:
Peter Zhu 2024-01-19 14:33:49 -05:00
parent 6bcbb9a02b
commit 580429d27c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
prism_compile.c
View File

@ -6302,7 +6302,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
// We will assign these values now, if applicable, and use them for
// the ISEQs on these multis
int required_multis_hidden_index = 0;
int required_multis_hidden_index = local_index;
int post_multis_hidden_index = 0;
// Here we figure out local table indices and insert them in to the
@ -6321,7 +6321,6 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
// def foo(a, (b, *c, d), e = 1, *f, g, (h, *i, j), k:, l: 1, **m, &n)
// ^^^^^^^^^^
case PM_MULTI_TARGET_NODE: {
required_multis_hidden_index = local_index;
local = rb_make_temporary_id(local_index);
local_table_for_iseq->ids[local_index] = local;
break;
@ -6770,7 +6769,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
// We want to account for this in our table size
pm_node_t *required = requireds_list->nodes[i];
if (PM_NODE_TYPE_P(required, PM_MULTI_TARGET_NODE)) {
ADD_GETLOCAL(ret, &dummy_line_node, table_size - required_multis_hidden_index, 0);
ADD_GETLOCAL(ret, &dummy_line_node, table_size - required_multis_hidden_index - (int)i, 0);
PM_COMPILE(required);
}
}

3
test/ruby/test_compile_prism.rb
View File

@ -1354,6 +1354,9 @@ a
assert_prism_eval("[[]].map { |a,b=1| a }")
assert_prism_eval("[{}].map { |a,| }")
assert_prism_eval("[{}].map { |a| a }")
# Test blocks with MultiTargetNode
assert_prism_eval("[[1, 2]].each.map { |(a), (b)| [a, b] }")
end
def test_ClassNode