summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-30 15:51:05 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-11-30 15:51:05 +0000
commited4b710fb30d406bedd0f443fb9afe455772c8e4 (patch)
tree2a0742eeb0f0ecf5089cd1fefdc466d45cb1ec91
parentefbc2990ecefc608279896cefadffbcb8234bfe9 (diff)
downloadruby-ed4b710fb30d406bedd0f443fb9afe455772c8e4.tar.gz
ruby-ed4b710fb30d406bedd0f443fb9afe455772c8e4.tar.xz
ruby-ed4b710fb30d406bedd0f443fb9afe455772c8e4.zip
* eval.c (rb_funcall2): allow to call protected methods.
fixed: [ruby-dev:27890] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 583367662..ff58aaf94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 1 00:50:33 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_funcall2): allow to call protected methods.
+ fixed: [ruby-dev:27890]
+
Wed Nov 30 23:52:17 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (NEWHEAP, ADD2HEAP): set count after pointer was set.
diff --git a/eval.c b/eval.c
index c11f0c42d..24b4d7321 100644
--- a/eval.c
+++ b/eval.c
@@ -5900,13 +5900,13 @@ rb_call(klass, recv, mid, argc, argv, scope)
return method_missing(recv, mid, argc, argv, scope==2?CSTAT_VCALL:0);
}
- if (mid != missing) {
+ if (mid != missing && scope == 0) {
/* receiver specified form for private method */
- if ((noex & NOEX_PRIVATE) && scope == 0)
+ if (noex & NOEX_PRIVATE)
return method_missing(recv, mid, argc, argv, CSTAT_PRIV);
/* self must be kind of a specified form for protected method */
- if ((noex & NOEX_PROTECTED)) {
+ if (noex & NOEX_PROTECTED) {
VALUE defined_class = klass;
if (TYPE(defined_class) == T_ICLASS) {