diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | lib/delegate.rb | 22 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,11 @@ +Sun Jun 15 22:48:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/delegate.rb (SimpleDelegator::dup): removed needless argument. + [ruby-list:44910] + + * lib/delegate.rb (clone, dup): keep relationship with the target + object. + Sun Jun 15 22:46:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * util.c (ruby_strtod): backported from 1.9. a patch from Satoshi diff --git a/lib/delegate.rb b/lib/delegate.rb index d810ccad42..ea5ef2b2ae 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -228,13 +228,15 @@ class SimpleDelegator<Delegator # Clone support for the object returned by \_\_getobj\_\_. def clone - super - __setobj__(__getobj__.clone) + new = super + new.__setobj__(__getobj__.clone) + new end # Duplication support for the object returned by \_\_getobj\_\_. - def dup(obj) - super - __setobj__(__getobj__.dup) + def dup + new = super + new.__setobj__(__getobj__.clone) + new end end @@ -281,12 +283,14 @@ def DelegateClass(superclass) @_dc_obj = obj end def clone # :nodoc: - super - __setobj__(__getobj__.clone) + new = super + new.__setobj__(__getobj__.clone) + new end def dup # :nodoc: - super - __setobj__(__getobj__.dup) + new = super + new.__setobj__(__getobj__.clone) + new end } for method in methods @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 205 +#define RUBY_PATCHLEVEL 206 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |