aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-02 07:29:03 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-02 07:29:03 +0000
commitc14780690131bf598c0a20dba58791f8d1c93881 (patch)
tree87ecbc799c0077c8d97bf7087a6a6bf1cb2c7384
parent5b7464b047069a71cd37ea5f86b5f86c3d009702 (diff)
downloadruby-c14780690131bf598c0a20dba58791f8d1c93881.tar.gz
* lib/delegate.rb (Delegator::MethodDelegation#respond_to):
respond_to? should now take optional second argument; submitted by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16751 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/delegate.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e20f3ab103..89f4b9b3c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 2 16:26:17 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/delegate.rb (Delegator::MethodDelegation#respond_to):
+ respond_to? should now take optional second argument; submitted
+ by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+
Mon Jun 2 16:14:18 2008 Akinori MUSHA <knu@iDaemons.org>
* lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This
diff --git a/lib/delegate.rb b/lib/delegate.rb
index c50eac2f61..337e763f62 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -152,9 +152,9 @@ class Delegator
# Checks for a method provided by this the delegate object by fowarding the
# call through \_\_getobj\_\_.
#
- def respond_to?(m)
+ def respond_to?(m, include_private = false)
return true if super
- return self.__getobj__.respond_to?(m)
+ return self.__getobj__.respond_to?(m, include_private)
end
#