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

Extract compile_match from iseq_compile_each0

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2017-03-12 19:36:23 +09:00
parent a92fdc90da
commit 270a674a79
No known key found for this signature in database
GPG Key ID: 7CD2805BFA3770C6
Notes: git 2021-09-01 16:17:29 +09:00 
Merged: https://github.com/ruby/ruby/pull/4795
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
compile.c
View File

@ -8661,6 +8661,44 @@ compile_yield(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, i
return COMPILE_OK; return COMPILE_OK;
} }
static int
compile_match(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped, const enum node_type type)
{
DECL_ANCHOR(recv);
DECL_ANCHOR(val);
INIT_ANCHOR(recv);
INIT_ANCHOR(val);
switch ((int)type) {
case NODE_MATCH:
ADD_INSN1(recv, node, putobject, node->nd_lit);
ADD_INSN2(val, node, getspecial, INT2FIX(0),
INT2FIX(0));
break;
case NODE_MATCH2:
CHECK(COMPILE(recv, "receiver", node->nd_recv));
CHECK(COMPILE(val, "value", node->nd_value));
break;
case NODE_MATCH3:
CHECK(COMPILE(recv, "receiver", node->nd_value));
CHECK(COMPILE(val, "value", node->nd_recv));
break;
}
ADD_SEQ(ret, recv);
ADD_SEQ(ret, val);
ADD_SEND(ret, node, idEqTilde, INT2FIX(1));
if (node->nd_args) {
compile_named_capture_assign(iseq, ret, node->nd_args);
}
if (popped) {
ADD_INSN(ret, node, pop);
}
return COMPILE_OK;
}
static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped); static int iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const node, int popped);
/** /**
compile each node compile each node
@ -9019,41 +9057,9 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *const no
} }
case NODE_MATCH: case NODE_MATCH:
case NODE_MATCH2: case NODE_MATCH2:
case NODE_MATCH3:{ case NODE_MATCH3:
DECL_ANCHOR(recv); CHECK(compile_match(iseq, ret, node, popped, type));
DECL_ANCHOR(val);
INIT_ANCHOR(recv);
INIT_ANCHOR(val);
switch (nd_type(node)) {
case NODE_MATCH:
ADD_INSN1(recv, node, putobject, node->nd_lit);
ADD_INSN2(val, node, getspecial, INT2FIX(0),
INT2FIX(0));
break;
case NODE_MATCH2:
CHECK(COMPILE(recv, "receiver", node->nd_recv));
CHECK(COMPILE(val, "value", node->nd_value));
break;
case NODE_MATCH3:
CHECK(COMPILE(recv, "receiver", node->nd_value));
CHECK(COMPILE(val, "value", node->nd_recv));
break;
}
ADD_SEQ(ret, recv);
ADD_SEQ(ret, val);
ADD_SEND(ret, node, idEqTilde, INT2FIX(1));
if (node->nd_args) {
compile_named_capture_assign(iseq, ret, node->nd_args);
}
if (popped) {
ADD_INSN(ret, node, pop);
}
break; break;
}
case NODE_LIT:{ case NODE_LIT:{
debugp_param("lit", node->nd_lit); debugp_param("lit", node->nd_lit);
if (!popped) { if (!popped) {