From ec2878c11bb0b5549c49ef2ae842a886c3905aa9 Mon Sep 17 00:00:00 2001 From: Jemma Issroff Date: Thu, 26 Oct 2023 06:57:05 -0300 Subject: [PATCH] [PRISM] Implement compilation for ConstantPathOrWriteNode --- prism_compile.c | 43 +++++++++++++++++++++++++++++++++ test/ruby/test_compile_prism.rb | 5 ++++ 2 files changed, 48 insertions(+) diff --git a/prism_compile.c b/prism_compile.c index fd1ba3c421..2059369bd4 100644 --- a/prism_compile.c +++ b/prism_compile.c @@ -1512,6 +1512,49 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, PM_POP_IF_POPPED; return; } + case PM_CONSTANT_PATH_OR_WRITE_NODE: { + pm_constant_path_or_write_node_t *constant_path_or_write_node = (pm_constant_path_or_write_node_t*) node; + + LABEL *lassign = NEW_LABEL(lineno); + LABEL *lfin = NEW_LABEL(lineno); + + pm_constant_path_node_t *target = constant_path_or_write_node->target; + PM_COMPILE(target->parent); + + pm_constant_read_node_t *child = (pm_constant_read_node_t *)target->child; + VALUE child_name = ID2SYM(pm_constant_id_lookup(scope_node, child->name)); + + ADD_INSN(ret, &dummy_line_node, dup); + ADD_INSN3(ret, &dummy_line_node, defined, INT2FIX(DEFINED_CONST_FROM), child_name, Qtrue); + ADD_INSNL(ret, &dummy_line_node, branchunless, lassign); + + ADD_INSN(ret, &dummy_line_node, dup); + ADD_INSN1(ret, &dummy_line_node, putobject, Qtrue); + ADD_INSN1(ret, &dummy_line_node, getconstant, child_name); + + PM_DUP_UNLESS_POPPED; + ADD_INSNL(ret, &dummy_line_node, branchif, lfin); + + PM_POP_UNLESS_POPPED; + ADD_LABEL(ret, lassign); + PM_COMPILE(constant_path_or_write_node->value); + + if (popped) { + ADD_INSN1(ret, &dummy_line_node, topn, INT2FIX(1)); + } + else { + ADD_INSN1(ret, &dummy_line_node, dupn, INT2FIX(2)); + ADD_INSN(ret, &dummy_line_node, swap); + } + + ADD_INSN1(ret, &dummy_line_node, setconstant, child_name); + ADD_LABEL(ret, lfin); + + if (!popped) ADD_INSN(ret, &dummy_line_node, swap); + PM_POP; + + return; + } case PM_CONSTANT_PATH_OPERATOR_WRITE_NODE: { pm_constant_path_operator_write_node_t *constant_path_operator_write_node = (pm_constant_path_operator_write_node_t*) node; diff --git a/test/ruby/test_compile_prism.rb b/test/ruby/test_compile_prism.rb index b33ed5319c..6ab143d93a 100644 --- a/test/ruby/test_compile_prism.rb +++ b/test/ruby/test_compile_prism.rb @@ -160,6 +160,11 @@ module Prism assert_prism_eval("::CPWN = 1") end + def test_ConstantPathOrWriteNode + assert_prism_eval("Prism::CPOrWN = nil; Prism::CPOrWN ||= 1") + assert_prism_eval("Prism::CPOrWN ||= 1") + end + def test_ConstantPathOperatorWriteNode assert_prism_eval("Prism::CPOWN = 0; Prism::CPOWN += 1") end