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

Make compile_array first_chunk argument bool instead of int

Browse Source
This commit is contained in:
Jeremy Evans 2024-01-30 07:30:06 -08:00
parent 332e0db675
commit 20732cadfd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
compile.c
View File

@ -4786,7 +4786,7 @@ static_literal_value(const NODE *node, rb_iseq_t *iseq)
} }
static int static int
compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped, int first_chunk) compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int popped, bool first_chunk)
{ {
const NODE *line_node = node; const NODE *line_node = node;
@ -4852,7 +4852,8 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
if (stack_len) { \ if (stack_len) { \
if (first_chunk) ADD_INSN1(ret, line_node, newarray, INT2FIX(stack_len)); \ if (first_chunk) ADD_INSN1(ret, line_node, newarray, INT2FIX(stack_len)); \
else ADD_INSN1(ret, line_node, pushtoarray, INT2FIX(stack_len)); \ else ADD_INSN1(ret, line_node, pushtoarray, INT2FIX(stack_len)); \
first_chunk = stack_len = 0; \ first_chunk = FALSE; \
stack_len = 0; \
} }
while (node) { while (node) {
@ -4878,7 +4879,7 @@ compile_array(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, int pop
FLUSH_CHUNK; FLUSH_CHUNK;
if (first_chunk) { if (first_chunk) {
ADD_INSN1(ret, line_node, duparray, ary); ADD_INSN1(ret, line_node, duparray, ary);
first_chunk = 0; first_chunk = FALSE;
} }
else { else {
ADD_INSN1(ret, line_node, putobject, ary); ADD_INSN1(ret, line_node, putobject, ary);
@ -10173,7 +10174,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
CHECK(compile_super(iseq, ret, node, popped, type)); CHECK(compile_super(iseq, ret, node, popped, type));
break; break;
case NODE_LIST:{ case NODE_LIST:{
CHECK(compile_array(iseq, ret, node, popped, 1) >= 0); CHECK(compile_array(iseq, ret, node, popped, TRUE) >= 0);
break; break;
} }
case NODE_ZLIST:{ case NODE_ZLIST:{
@ -10428,7 +10429,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
CHECK(COMPILE(ret, "argscat head", RNODE_ARGSCAT(node)->nd_head)); CHECK(COMPILE(ret, "argscat head", RNODE_ARGSCAT(node)->nd_head));
const NODE *body_node = RNODE_ARGSCAT(node)->nd_body; const NODE *body_node = RNODE_ARGSCAT(node)->nd_body;
if (nd_type_p(body_node, NODE_LIST)) { if (nd_type_p(body_node, NODE_LIST)) {
CHECK(compile_array(iseq, ret, body_node, popped, 0) >= 0); CHECK(compile_array(iseq, ret, body_node, popped, FALSE) >= 0);
} }
else { else {
CHECK(COMPILE(ret, "argscat body", body_node)); CHECK(COMPILE(ret, "argscat body", body_node));