diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-30 07:57:21 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-30 07:57:21 +0000 |
| commit | 1411322fcbc939635de70d9ba9e6e221cc9e987d (patch) | |
| tree | bcfb4b6ffc383dbe5ea67419d00bcfd3983f1399 /vm_eval.c | |
| parent | a5efaf33b89e0fa701f5d79b4bc786ac7002e614 (diff) | |
| download | ruby-1411322fcbc939635de70d9ba9e6e221cc9e987d.tar.gz ruby-1411322fcbc939635de70d9ba9e6e221cc9e987d.tar.xz ruby-1411322fcbc939635de70d9ba9e6e221cc9e987d.zip | |
* vm_eval.c (vm_call0, vm_call_super, rb_f_send, rb_f_public_send):
fixed call_type. [ruby-dev:39581]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
| -rw-r--r-- | vm_eval.c | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -21,7 +21,6 @@ static NODE *vm_cref_push(rb_thread_t *th, VALUE klass, int noex); static VALUE vm_exec(rb_thread_t *th); static void vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref); static int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary); -static VALUE send_internal(int argc, const VALUE *argv, VALUE recv, int scope); typedef enum call_type { CALL_PUBLIC, @@ -29,6 +28,8 @@ typedef enum call_type { CALL_VCALL, } call_type; +static VALUE send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope); + static inline VALUE vm_call0(rb_thread_t* th, VALUE recv, VALUE id, int argc, const VALUE *argv, const rb_method_entry_t *me) @@ -104,7 +105,7 @@ vm_call0(rb_thread_t* th, VALUE recv, VALUE id, int argc, const VALUE *argv, case VM_METHOD_TYPE_ZSUPER: { klass = RCLASS_SUPER(klass); if (!klass || !(me = rb_method_entry(klass, id))) { - return method_missing(recv, id, argc, argv, 0); + return method_missing(recv, id, argc, argv, NOEX_SUPER); } RUBY_VM_CHECK_INTS(); if (!(def = me->def)) return Qnil; @@ -121,7 +122,7 @@ vm_call0(rb_thread_t* th, VALUE recv, VALUE id, int argc, const VALUE *argv, case VM_METHOD_TYPE_OPTIMIZED: { switch (def->body.optimize_type) { case OPTIMIZED_METHOD_TYPE_SEND: - val = send_internal(argc, argv, recv, NOEX_NOSUPER | NOEX_PRIVATE); + val = send_internal(argc, argv, recv, CALL_FCALL); break; case OPTIMIZED_METHOD_TYPE_CALL: { rb_proc_t *proc; @@ -175,7 +176,7 @@ vm_call_super(rb_thread_t *th, int argc, const VALUE *argv) me = rb_method_entry(klass, id); if (!me) { - return method_missing(recv, id, argc, argv, 0); + return method_missing(recv, id, argc, argv, NOEX_SUPER); } return vm_call0(th, recv, id, argc, argv, me); @@ -573,7 +574,7 @@ rb_funcall3(VALUE recv, ID mid, int argc, const VALUE *argv) } static VALUE -send_internal(int argc, const VALUE *argv, VALUE recv, int scope) +send_internal(int argc, const VALUE *argv, VALUE recv, call_type scope) { VALUE vid; VALUE self = RUBY_VM_PREVIOUS_CONTROL_FRAME(GET_THREAD()->cfp)->self; @@ -610,7 +611,7 @@ send_internal(int argc, const VALUE *argv, VALUE recv, int scope) VALUE rb_f_send(int argc, VALUE *argv, VALUE recv) { - return send_internal(argc, argv, recv, NOEX_NOSUPER | NOEX_PRIVATE); + return send_internal(argc, argv, recv, CALL_FCALL); } /* @@ -627,7 +628,7 @@ rb_f_send(int argc, VALUE *argv, VALUE recv) VALUE rb_f_public_send(int argc, VALUE *argv, VALUE recv) { - return send_internal(argc, argv, recv, NOEX_PUBLIC); + return send_internal(argc, argv, recv, CALL_PUBLIC); } /* yield */ |