mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* compile.c, compile.h : add ADD_CALL_RECEIVER() macro.
* insns.def (send) : use GET_SELF() direct if FCALL. * eval.c (rb_f_send) : check method dispatch type to permit nvoking private method when dispatch type is FCALL/VCALL * insns.def (opt_ltlt) : remove useless statement. * vm.h : remove unused macros. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11483 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
21e39197e6
commit
ed9d4087f6
6 changed files with 49 additions and 17 deletions
17
compile.c
17
compile.c
|
@ -2901,7 +2901,7 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
end_label, redo_label);
|
||||
}
|
||||
else {
|
||||
ADD_INSN(ret, nd_line(node), putself);
|
||||
ADD_CALL_RECEIVER(ret, nd_line(node));
|
||||
ADD_CALL(ret, nd_line(node), ID2SYM(idGets), INT2FIX(0));
|
||||
ADD_INSNL(ret, nd_line(node), branchif, redo_label) ;
|
||||
/* opt_n */
|
||||
|
@ -3626,7 +3626,7 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
COMPILE(recv, "recv", node->nd_recv);
|
||||
}
|
||||
else if (type == NODE_FCALL || type == NODE_VCALL) {
|
||||
ADD_INSN(recv, nd_line(node), putself);
|
||||
ADD_CALL_RECEIVER(recv, nd_line(node));
|
||||
}
|
||||
|
||||
/* args */
|
||||
|
@ -4013,7 +4013,7 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
break;
|
||||
}
|
||||
case NODE_XSTR:{
|
||||
ADD_INSN(ret, nd_line(node), putself);
|
||||
ADD_CALL_RECEIVER(ret, nd_line(node));
|
||||
ADD_INSN1(ret, nd_line(node), putobject, node->nd_lit);
|
||||
ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
|
||||
|
||||
|
@ -4023,7 +4023,7 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
break;
|
||||
}
|
||||
case NODE_DXSTR:{
|
||||
ADD_INSN(ret, nd_line(node), putself);
|
||||
ADD_CALL_RECEIVER(ret, nd_line(node));
|
||||
compile_dstr(iseq, ret, node);
|
||||
ADD_CALL(ret, nd_line(node), ID2SYM(idBackquote), INT2FIX(1));
|
||||
|
||||
|
@ -4258,7 +4258,7 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
}
|
||||
else {
|
||||
/* function call */
|
||||
ADD_INSN(ret, nd_line(node), putself);
|
||||
ADD_CALL_RECEIVER(ret, nd_line(node));
|
||||
COMPILE(ret, "colon2#nd_head", node->nd_head);
|
||||
ADD_CALL(ret, nd_line(node), ID2SYM(node->nd_mid),
|
||||
INT2FIX(1));
|
||||
|
@ -4507,11 +4507,12 @@ iseq_compile_each(yarv_iseq_t *iseq, LINK_ANCHOR *ret, NODE * node, int poped)
|
|||
break;
|
||||
}
|
||||
case NODE_LAMBDA:{
|
||||
/* compile same as lambda{...} */
|
||||
VALUE block = NEW_CHILD_ISEQVAL(node, make_name_for_block(iseq), ISEQ_TYPE_BLOCK);
|
||||
VALUE argc = INT2FIX(0);
|
||||
ADD_INSN (ret, nd_line(node), putself);
|
||||
ADD_SEND_R(ret, nd_line(node), ID2SYM(idLambda), argc,
|
||||
block, INT2FIX(VM_CALL_FCALL_BIT));
|
||||
ADD_CALL_RECEIVER(ret, nd_line(node));
|
||||
ADD_CALL_WITH_BLOCK(ret, nd_line(node), ID2SYM(idLambda), argc, block);
|
||||
|
||||
if (poped) {
|
||||
ADD_INSN(ret, nd_line(node), pop);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue