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

* vm.c (eval_search_super_klass): rename to search_super_klass() and

Browse Source 
use it by th_call_super().
* insns.def: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-01-16 08:52:22 +00:00
parent 5078c85782
commit ca46eab090
3 changed files with 2461 additions and 2445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jan 16 17:49:29 2007 Koichi Sasada <ko1@atdot.net>
* vm.c (eval_search_super_klass): rename to search_super_klass() and
use it by th_call_super().
* insns.def: ditto.
Tue Jan 16 17:48:11 2007 Koichi Sasada <ko1@atdot.net> Tue Jan 16 17:48:11 2007 Koichi Sasada <ko1@atdot.net>
* common.mk: fix ruby script path. * common.mk: fix ruby script path.

4
insns.def
View File

@ -958,7 +958,7 @@ defined
ip = ip->parent_iseq; ip = ip->parent_iseq;
} }
if (ip) { if (ip) {
VALUE klass = eval_search_super_klass(ip->klass, GET_SELF()); VALUE klass = search_super_klass(ip->klass, GET_SELF());
if (rb_method_boundp(klass, ip->defined_method_id, 0)) { if (rb_method_boundp(klass, ip->defined_method_id, 0)) {
expr_type = "super"; expr_type = "super";
} }
@ -1266,7 +1266,7 @@ send
} }
} }
} }
klass = eval_search_super_klass(ip->klass, recv); klass = search_super_klass(ip->klass, recv);
flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT; flag = VM_CALL_SUPER_BIT | VM_CALL_FCALL_BIT;
blockptr = tmp_blockptr; blockptr = tmp_blockptr;
mn = rb_method_node(klass, id); mn = rb_method_node(klass, id);

49
vm.c
View File

@ -526,6 +526,25 @@ th_call0(yarv_thread_t *th, VALUE klass, VALUE recv,
return val; return val;
} }
static VALUE
search_super_klass(VALUE klass, VALUE recv)
{
if (BUILTIN_TYPE(klass) == T_CLASS) {
klass = RCLASS(klass)->super;
}
else if (BUILTIN_TYPE(klass) == T_MODULE) {
VALUE k = CLASS_OF(recv);
while (k) {
if (BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass) {
klass = RCLASS(k)->super;
break;
}
k = RCLASS(k)->super;
}
}
return klass;
}
VALUE VALUE
th_call_super(yarv_thread_t *th, int argc, const VALUE *argv) th_call_super(yarv_thread_t *th, int argc, const VALUE *argv)
{ {
@ -537,7 +556,13 @@ th_call_super(yarv_thread_t *th, int argc, const VALUE *argv)
yarv_control_frame_t *cfp = th->cfp; yarv_control_frame_t *cfp = th->cfp;
if (!th->cfp->iseq) { if (!th->cfp->iseq) {
klass = RCLASS(cfp->method_klass)->super; klass = cfp->method_klass;
klass = RCLASS(klass)->super;
if (klass == 0) {
klass = search_super_klass(cfp->method_klass, recv);
}
id = cfp->method_id; id = cfp->method_id;
} }
else { else {
@ -545,14 +570,17 @@ th_call_super(yarv_thread_t *th, int argc, const VALUE *argv)
} }
body = rb_method_node(klass, id); /* this returns NODE_METHOD */ body = rb_method_node(klass, id); /* this returns NODE_METHOD */
if (body) { if (body) {
body = body->nd_body; body = body->nd_body;
} }
else { else {
dp(recv);
dp(klass); dp(klass);
dpi(id); dpi(id);
rb_bug("th_call_super: not found"); rb_bug("th_call_super: not found");
} }
return th_call0(th, klass, recv, id, id, argc, argv, body, nosuper); return th_call0(th, klass, recv, id, id, argc, argv, body, nosuper);
} }
@ -1174,25 +1202,6 @@ eval_define_method(yarv_thread_t *th, VALUE obj,
INC_VM_STATE_VERSION(); INC_VM_STATE_VERSION();
} }
EVALBODY_HELPER_FUNCTION VALUE
eval_search_super_klass(VALUE klass, VALUE recv)
{
if (BUILTIN_TYPE(klass) == T_CLASS) {
klass = RCLASS(klass)->super;
}
else if (BUILTIN_TYPE(klass) == T_MODULE) {
VALUE k = CLASS_OF(recv);
while (k) {
if (BUILTIN_TYPE(k) == T_ICLASS && RBASIC(k)->klass == klass) {
klass = RCLASS(k)->super;
break;
}
k = RCLASS(k)->super;
}
}
return klass;
}
EVALBODY_HELPER_FUNCTION VALUE EVALBODY_HELPER_FUNCTION VALUE
eval_method_missing(yarv_thread_t *th, ID id, VALUE recv, int num, eval_method_missing(yarv_thread_t *th, ID id, VALUE recv, int num,
yarv_block_t *blockptr, int opt) yarv_block_t *blockptr, int opt)