summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-21 15:11:24 (GMT)
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-21 15:11:24 (GMT)
commit8cc81b3a6c473baaa543aca68df7e4d798a3eeeb (patch)
tree1791fd85cdeee4a90bb6790d7bad4b649673c9dd
parentf61afaad7277b3463fbdd5f6017527fe255abfaf (diff)
merge revision(s) 16752:
* lib/delegate.rb (DelegateClass, Delegator#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/branches/ruby_1_8_6@17508 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/delegate.rb8
-rw-r--r--version.h8
3 files changed, 14 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index c09d171..6fd7172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 22 00:09:20 2008 Akinori MUSHA <knu@iDaemons.org>
+
+ * lib/delegate.rb (DelegateClass, Delegator#respond_to?):
+ respond_to? should now take optional second argument; submitted
+ by Jeremy Kemper <jeremy at bitsweat.net> in [ruby-core:17045].
+
Fri Jun 20 18:24:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_buf_append): should infect.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index ea5ef2b..ee5fe8d 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -164,9 +164,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
#
@@ -271,9 +271,9 @@ def DelegateClass(superclass)
end
@_dc_obj.__send__(m, *args)
end
- def respond_to?(m) # :nodoc:
+ def respond_to?(m, include_private = false) # :nodoc:
return true if super
- return @_dc_obj.respond_to?(m)
+ return @_dc_obj.respond_to?(m, include_private)
end
def __getobj__ # :nodoc:
@_dc_obj
diff --git a/version.h b/version.h
index eae0a76..fa9b340 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-06-20"
+#define RUBY_RELEASE_DATE "2008-06-22"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080620
-#define RUBY_PATCHLEVEL 230
+#define RUBY_RELEASE_CODE 20080622
+#define RUBY_PATCHLEVEL 231
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 20
+#define RUBY_RELEASE_DAY 22
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];