diff options
| author | Matt Valentine-House <matt@eightbitraptor.com> | 2023-12-15 20:07:49 +0000 |
|---|---|---|
| committer | Kevin Newton <kddnewton@gmail.com> | 2023-12-15 16:15:10 -0500 |
| commit | 161787f9beef96c9fa1057b6378fe7e048ac2ecd (patch) | |
| tree | 47ce3ed24be72622763bd928cbc9797beb477be8 | |
| parent | 5b6a4d8c1253fd1ab77c0539d33276fe1856cf24 (diff) | |
[PRISM] Compile CallTargetNode
| -rw-r--r-- | prism_compile.c | 20 | ||||
| -rw-r--r-- | test/ruby/test_compile_prism.rb | 24 |
2 files changed, 43 insertions, 1 deletions
diff --git a/prism_compile.c b/prism_compile.c index a7c50f389b..30918344c0 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -1226,6 +1226,12 @@ pm_compile_multi_write_lhs(rb_iseq_t *iseq, NODE dummy_line_node, const uint8_t } break; } + case PM_CALL_TARGET_NODE: { + pm_call_target_node_t *cast = (pm_call_target_node_t *)node; + PM_COMPILE_NOT_POPPED((pm_node_t *)cast->receiver); + pushed++; + break; + } case PM_MULTI_TARGET_NODE: { pm_multi_target_node_t *cast = (pm_multi_target_node_t *) node; for (size_t index = 0; index < cast->lefts.size; index++) { @@ -4940,7 +4946,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, pm_multi_write_node_t *multi_write_node = (pm_multi_write_node_t *)node; pm_node_list_t *lefts = &multi_write_node->lefts; pm_node_list_t *rights = &multi_write_node->rights; - size_t argc = 0; + size_t argc = 1; // pre-process the left hand side of multi-assignments. uint8_t pushed = 0; @@ -4997,6 +5003,18 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, PM_POP; PM_POP; remainder -= argc; + + } else if (PM_NODE_TYPE_P(considered_node, PM_CALL_TARGET_NODE)) { + pm_call_target_node_t *cast = (pm_call_target_node_t *)considered_node; + + VALUE vals = INT2FIX(remainder + (lefts->size - index)); + ADD_INSN1(ret, &dummy_line_node, topn, vals); + ADD_INSN(ret, &dummy_line_node, swap); + + ID method_id = pm_constant_id_lookup(scope_node, cast->name); + ADD_SEND(ret, &dummy_line_node, method_id, INT2FIX(argc)); + PM_POP; + remainder -= argc; } else { PM_COMPILE(lefts->nodes[index]); } diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb index 28adbe0916..70da238f7d 100644 --- a/test/ruby/test_compile_prism.rb +++ b/test/ruby/test_compile_prism.rb @@ -534,6 +534,30 @@ module Prism assert_prism_eval("_, {}[:foo], _ = 1") assert_prism_eval("_,{}[:foo], _, {}[:bar] = 1") + assert_prism_eval(<<~CODE) + class Foo + def bar=(x); end + def baz=(c); end + end + foo = Foo.new + foo.bar, foo.baz = 1 + CODE + assert_prism_eval(<<~CODE) + class Foo + def bar=(x); end + def baz=(c); end + end + foo = Foo.new + _, foo.bar, foo.baz = 1 + CODE + assert_prism_eval(<<~CODE) + class Foo + def bar=(x); end + def baz=(c); end + end + foo = Foo.new + _, foo.bar, _, foo.baz = 1 + CODE end ############################################################################ |