shyouhei	2008-06-15 22:48:10 +0900 (Sun, 15 Jun 2008)

  New Revision: 17284

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/delegate.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 16369:
    * lib/delegate.rb (SimpleDelegator::dup): removed needless argument.
      [ruby-list:44910]
    * lib/delegate.rb (clone, dup): keep relationship with the target
      object.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/delegate.rb?r1=17284&r2=17283&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17284&r2=17283&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17284&r2=17283&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17283)
+++ ruby_1_8_5/ChangeLog	(revision 17284)
@@ -1,3 +1,11 @@
+Sun Jun 15 22:47:37 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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:45:19 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* util.c (ruby_strtod): backported from 1.9.  a patch from Satoshi
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17283)
+++ ruby_1_8_5/version.h	(revision 17284)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 204
+#define RUBY_PATCHLEVEL 205
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/delegate.rb
===================================================================
--- ruby_1_8_5/lib/delegate.rb	(revision 17283)
+++ ruby_1_8_5/lib/delegate.rb	(revision 17284)
@@ -227,13 +227,15 @@
 
   # 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
 
@@ -280,12 +282,14 @@
       @_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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/