diff options
| -rw-r--r-- | compile.c | 14 | ||||
| -rw-r--r-- | vm_insnhelper.c | 2 |
2 files changed, 8 insertions, 8 deletions
@@ -4404,18 +4404,18 @@ compile_const_prefix(rb_iseq_t *iseq, const NODE *const node, switch (nd_type(node)) { case NODE_CONST: debugi("compile_const_prefix - colon", node->nd_vid); - ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_vid), 1); + ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_vid), 1); break; case NODE_COLON3: debugi("compile_const_prefix - colon3", node->nd_mid); ADD_INSN(body, nd_line(node), pop); ADD_INSN1(body, nd_line(node), putobject, rb_cObject); - ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_mid), 1); + ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_mid), 1); break; case NODE_COLON2: CHECK(compile_const_prefix(iseq, node->nd_head, pref, body)); debugi("compile_const_prefix - colon2", node->nd_mid); - ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_mid), 0); + ADD_INSN2(body, nd_line(node), getconstant, ID2SYM(node->nd_mid), 0); break; default: CHECK(COMPILE(pref, "const colon2 prefix", node)); @@ -7154,7 +7154,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in ADD_INSNL(ret, line, branchunless, lassign); /* cref */ } ADD_INSN(ret, line, dup); /* cref cref */ - ADD_INSN2(ret, line, getconstant, ID2SYM(mid), 1); /* cref obj */ + ADD_INSN2(ret, line, getconstant, ID2SYM(mid), 1); /* cref obj */ if (node->nd_aid == idOROP || node->nd_aid == idANDOP) { lfin = NEW_LABEL(line); @@ -7500,13 +7500,13 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in int ic_index = body->is_size++; ADD_INSN2(ret, line, opt_getinlinecache, lend, INT2FIX(ic_index)); - ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_vid), 1); + ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_vid), 1); ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index)); ADD_LABEL(ret, lend); } else { ADD_INSN(ret, line, putnil); - ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_vid), 1); + ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_vid), 1); } if (popped) { @@ -7893,7 +7893,7 @@ iseq_compile_each0(rb_iseq_t *iseq, LINK_ANCHOR *const ret, const NODE *node, in } ADD_INSN1(ret, line, putobject, rb_cObject); - ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_mid), 1); + ADD_INSN2(ret, line, getconstant, ID2SYM(node->nd_mid), 1); if (ISEQ_COMPILE_DATA(iseq)->option->inline_const_cache) { ADD_INSN1(ret, line, opt_setinlinecache, INT2FIX(ic_index)); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 1b985f4e8d..2d765e1e95 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -3146,7 +3146,7 @@ vm_defined(rb_execution_context_t *ec, rb_control_frame_t *reg_cfp, rb_num_t op_ } case DEFINED_CONST: klass = v; - if (vm_get_ev_const(ec, klass, SYM2ID(obj), 1, 1)) { + if (vm_get_ev_const(ec, klass, SYM2ID(obj), 1, 1)) { expr_type = DEFINED_CONST; } break; |