Skip to content

Commit

Permalink
[PRISM] Remove dummy_line_node usage in pm_interpolated_node_compile
Browse files Browse the repository at this point in the history
  • Loading branch information
@kddnewton
kddnewton committed Apr 4, 2024
1 parent 5891878 commit 6c1cf52
Showing 1 changed file with 35 additions and 34 deletions.
69 changes: 35 additions & 34 deletions prism_compile.c
View file
Expand Up @@ -292,9 +292,9 @@ pm_optimizable_range_item_p(pm_node_t *node)
static void pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node);

static int
pm_interpolated_node_compile(const pm_node_list_t *parts, rb_iseq_t *iseq, NODE dummy_line_node, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
pm_interpolated_node_compile(rb_iseq_t *iseq, const pm_node_list_t *parts, const pm_line_column_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
{
int number_of_items_pushed = 0;
int stack_size = 0;
size_t parts_size = parts->size;

if (parts_size > 0) {
Expand All @@ -304,8 +304,8 @@ pm_interpolated_node_compile(const pm_node_list_t *parts, rb_iseq_t *iseq, NODE
const pm_node_t *part = parts->nodes[index];

if (PM_NODE_TYPE_P(part, PM_STRING_NODE)) {
const pm_string_node_t *string_node = (const pm_string_node_t *)part;
VALUE string_value = parse_string_encoded(scope_node, (pm_node_t *)string_node, &string_node->unescaped);
const pm_string_node_t *string_node = (const pm_string_node_t *) part;
VALUE string_value = parse_string_encoded(scope_node, (const pm_node_t *) string_node, &string_node->unescaped);

if (RTEST(current_string)) {
current_string = rb_str_concat(current_string, string_value);
Expand All @@ -314,10 +314,12 @@ pm_interpolated_node_compile(const pm_node_list_t *parts, rb_iseq_t *iseq, NODE
current_string = string_value;
}
}
else if (PM_NODE_TYPE_P(part, PM_EMBEDDED_STATEMENTS_NODE) &&
((const pm_embedded_statements_node_t *) part)->statements != NULL &&
((const pm_embedded_statements_node_t *) part)->statements->body.size == 1 &&
PM_NODE_TYPE_P(((const pm_embedded_statements_node_t *) part)->statements->body.nodes[0], PM_STRING_NODE)) {
else if (
PM_NODE_TYPE_P(part, PM_EMBEDDED_STATEMENTS_NODE) &&
((const pm_embedded_statements_node_t *) part)->statements != NULL &&
((const pm_embedded_statements_node_t *) part)->statements->body.size == 1 &&
PM_NODE_TYPE_P(((const pm_embedded_statements_node_t *) part)->statements->body.nodes[0], PM_STRING_NODE)
) {
const pm_string_node_t *string_node = (const pm_string_node_t *) ((const pm_embedded_statements_node_t *) part)->statements->body.nodes[0];
VALUE string_value = parse_string_encoded(scope_node, (pm_node_t *)string_node, &string_node->unescaped);

Expand All @@ -333,32 +335,30 @@ pm_interpolated_node_compile(const pm_node_list_t *parts, rb_iseq_t *iseq, NODE
current_string = rb_enc_str_new(NULL, 0, scope_node->encoding);
}

ADD_INSN1(ret, &dummy_line_node, putobject, rb_fstring(current_string));

current_string = Qnil;
number_of_items_pushed++;

PUSH_INSN1(ret, *node_location, putobject, rb_fstring(current_string));
PM_COMPILE_NOT_POPPED(part);
PM_DUP;
ADD_INSN1(ret, &dummy_line_node, objtostring, new_callinfo(iseq, idTo_s, 0, VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE , NULL, FALSE));
ADD_INSN(ret, &dummy_line_node, anytostring);
PUSH_INSN(ret, *node_location, dup);
PUSH_INSN1(ret, *node_location, objtostring, new_callinfo(iseq, idTo_s, 0, VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE , NULL, FALSE));
PUSH_INSN(ret, *node_location, anytostring);

number_of_items_pushed++;
current_string = Qnil;
stack_size += 2;
}
}

if (RTEST(current_string)) {
current_string = rb_fstring(current_string);
ADD_INSN1(ret, &dummy_line_node, putobject, current_string);
PUSH_INSN1(ret, *node_location, putobject, current_string);

current_string = Qnil;
number_of_items_pushed++;
stack_size++;
}
}
else {
PM_PUTNIL;
PUSH_INSN(ret, *node_location, putnil);
}

return number_of_items_pushed;
return stack_size;
}

static VALUE
Expand Down Expand Up @@ -523,8 +523,7 @@ parse_regexp_concat(rb_iseq_t *iseq, const pm_scope_node_t *scope_node, const pm
static void
pm_compile_regexp_dynamic(rb_iseq_t *iseq, const pm_node_t *node, const pm_node_list_t *parts, const pm_line_column_t *node_location, LINK_ANCHOR *const ret, bool popped, pm_scope_node_t *scope_node)
{
NODE dummy_line_node = generate_dummy_line_node(node_location->line, node_location->column);
int length = pm_interpolated_node_compile(parts, iseq, dummy_line_node, ret, popped, scope_node);
int length = pm_interpolated_node_compile(iseq, parts, node_location, ret, popped, scope_node);
PUSH_INSN2(ret, *node_location, toregexp, INT2FIX(parse_regexp_flags(node) & 0xFF), INT2FIX(length));
}

Expand Down Expand Up @@ -6217,7 +6216,7 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
}
else {
const pm_interpolated_string_node_t *cast = (const pm_interpolated_string_node_t *) node;
int length = pm_interpolated_node_compile(&cast->parts, iseq, dummy_line_node, ret, popped, scope_node);
int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, popped, scope_node);

if (length > 1) PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));
if (popped) PUSH_INSN(ret, location, pop);
Expand All @@ -6229,7 +6228,6 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
// :"foo #{bar}"
// ^^^^^^^^^^^^^
const pm_interpolated_symbol_node_t *cast = (const pm_interpolated_symbol_node_t *) node;
int length;

if (PM_NODE_FLAG_P(node, PM_NODE_FLAG_STATIC_LITERAL)) {
if (!popped) {
Expand All @@ -6238,7 +6236,8 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
}
}
else {
if ((length = pm_interpolated_node_compile(&cast->parts, iseq, dummy_line_node, ret, popped, scope_node)) > 1) {
int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, popped, scope_node);
if (length > 1) {
PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));
}

Expand All @@ -6253,16 +6252,18 @@ pm_compile_node(rb_iseq_t *iseq, const pm_node_t *node, LINK_ANCHOR *const ret,
return;
}
case PM_INTERPOLATED_X_STRING_NODE: {
pm_interpolated_x_string_node_t *interp_x_string_node = (pm_interpolated_x_string_node_t *) node;
PM_PUTSELF;
int number_of_items_pushed = pm_interpolated_node_compile(&interp_x_string_node->parts, iseq, dummy_line_node, ret, false, scope_node);
// `foo #{bar}`
// ^^^^^^^^^^^^
const pm_interpolated_x_string_node_t *cast = (const pm_interpolated_x_string_node_t *) node;

if (number_of_items_pushed > 1) {
ADD_INSN1(ret, &dummy_line_node, concatstrings, INT2FIX(number_of_items_pushed));
}
PUSH_INSN(ret, location, putself);

int length = pm_interpolated_node_compile(iseq, &cast->parts, &location, ret, false, scope_node);
if (length > 1) PUSH_INSN1(ret, location, concatstrings, INT2FIX(length));

PUSH_SEND_WITH_FLAG(ret, location, idBackquote, INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
if (popped) PUSH_INSN(ret, location, pop);

ADD_SEND_WITH_FLAG(ret, &dummy_line_node, idBackquote, INT2NUM(1), INT2FIX(VM_CALL_FCALL | VM_CALL_ARGS_SIMPLE));
PM_POP_IF_POPPED;
return;
}
case PM_KEYWORD_HASH_NODE: {
Expand Down

0 comments on commit 6c1cf52

Please sign in to comment.