summaryrefslogtreecommitdiffstats
path: root/eval.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-30 04:27:41 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-08-30 04:27:41 +0000
commit9328cf57a096563eebc512a71a314b3a3dd4e02e (patch)
tree114fa47e46066a829a1bf09fbeb158b6f5686efd /eval.c
parent91541f4c4e97c7b329c997d03501a7ce7310de7f (diff)
downloadruby-9328cf57a096563eebc512a71a314b3a3dd4e02e.tar.gz
ruby-9328cf57a096563eebc512a71a314b3a3dd4e02e.tar.xz
ruby-9328cf57a096563eebc512a71a314b3a3dd4e02e.zip
* eval.c (rb_f_send): do not call private methods if the receiver
is specified. [ruby-talk:153672] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/eval.c b/eval.c
index a0b31db0d..3990e895d 100644
--- a/eval.c
+++ b/eval.c
@@ -5844,6 +5844,7 @@ rb_call0(klass, recv, id, oid, argc, argv, body, flags)
ruby_frame->this_class = (flags & NOEX_NOSUPER)?0:klass;
ruby_frame->self = recv;
ruby_frame->argc = argc;
+ ruby_frame->flags = (flags & NOEX_RECV) ? FRAME_FUNC : 0;
switch (nd_type(body)) {
case NODE_CFUNC:
@@ -6040,7 +6041,9 @@ rb_call(klass, recv, mid, argc, argv, scope)
return method_missing(recv, mid, argc, argv, CSTAT_PROT);
}
}
-
+ if (scope > 0) { /* pass receiver info */
+ noex |= NOEX_RECV;
+ }
return rb_call0(klass, recv, mid, id, argc, argv, body, noex);
}
@@ -6084,12 +6087,13 @@ rb_f_send(argc, argv, recv)
VALUE recv;
{
VALUE vid;
+ int scope = (ruby_frame->flags & FRAME_FUNC) ? 1 : 0;
if (argc == 0) rb_raise(rb_eArgError, "no method name given");
vid = *argv++; argc--;
PUSH_ITER(rb_block_given_p()?ITER_PRE:ITER_NOT);
- vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, 1);
+ vid = rb_call(CLASS_OF(recv), recv, rb_to_id(vid), argc, argv, scope);
POP_ITER();
return vid;