Skip to content

[pull] master from ruby:master #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Oct 27, 2025
Merged

[pull] master from ruby:master #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions prism_compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5338,8 +5338,7 @@ pm_compile_for_node_index(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *c
case PM_INSTANCE_VARIABLE_TARGET_NODE:
case PM_CONSTANT_PATH_TARGET_NODE:
case PM_CALL_TARGET_NODE:
case PM_INDEX_TARGET_NODE:
case PM_SPLAT_NODE: {
case PM_INDEX_TARGET_NODE: {
// For other targets, we need to potentially compile the parent or
// owning expression of this target, then retrieve the value, expand it,
// and then compile the necessary writes.
Expand All @@ -5359,6 +5358,7 @@ pm_compile_for_node_index(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *c
pm_multi_target_state_update(&state);
break;
}
case PM_SPLAT_NODE:
case PM_MULTI_TARGET_NODE: {
DECL_ANCHOR(writes);
DECL_ANCHOR(cleanup);
Expand Down Expand Up @@ -5394,6 +5394,12 @@ pm_compile_for_node_index(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *c
PUSH_INSN(ret, location, pop);

PUSH_LABEL(ret, not_single);

if (PM_NODE_TYPE_P(node, PM_SPLAT_NODE)) {
const pm_splat_node_t *cast = (const pm_splat_node_t *) node;
PUSH_INSN2(ret, location, expandarray, INT2FIX(0), INT2FIX(cast->expression == NULL ? 0 : 1));
}

PUSH_SEQ(ret, writes);
PUSH_SEQ(ret, cleanup);
break;
Expand Down
15 changes: 9 additions & 6 deletions test/ruby/test_compile_prism.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,16 +1046,19 @@ def o.bar = @ret.length < 3
end

def test_ForNode
assert_prism_eval("for i in [1,2] do; i; end")
assert_prism_eval("for @i in [1,2] do; @i; end")
assert_prism_eval("for $i in [1,2] do; $i; end")
assert_prism_eval("r = []; for i in [1,2] do; r << i; end; r")
assert_prism_eval("r = []; for @i in [1,2] do; r << @i; end; r")
assert_prism_eval("r = []; for $i in [1,2] do; r << $i; end; r")

assert_prism_eval("for foo, in [1,2,3] do end")
assert_prism_eval("r = []; for foo, in [1,2,3] do r << foo end; r")

assert_prism_eval("for i, j in {a: 'b'} do; i; j; end")
assert_prism_eval("r = []; for i, j in {a: 'b'} do; r << [i, j]; end; r")

# Test splat node as index in for loop
assert_prism_eval("for *x in [[1,2], [3,4]] do; x; end")
assert_prism_eval("r = []; for *x in [[1,2], [3,4]] do; r << x; end; r")
assert_prism_eval("r = []; for * in [[1,2], [3,4]] do; r << 'ok'; end; r")
assert_prism_eval("r = []; for x, * in [[1,2], [3,4]] do; r << x; end; r")
assert_prism_eval("r = []; for x, *y in [[1,2], [3,4]] do; r << [x, y]; end; r")
end

############################################################################
Expand Down