From 41f89359bbe20a81a4afb3bbddc3040f07eef074 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 12 May 2008 01:41:12 +0000
Subject: [PATCH] * lib/delegate.rb (SimpleDelegator::dup): removed needless
 argument.   [ruby-list:44910]

* lib/delegate.rb (clone, dup): keep relationship with the target
  object.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  8 ++++++++
 lib/delegate.rb | 22 +++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e775007e1a..d8cf747202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon May 12 10:41:10 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 May 11 23:19:39 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enum.c (all_iter_i, any_iter_i): reduced duplicated code.
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 220933c464..971b4a4aec 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -227,13 +227,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
 
@@ -280,12 +282,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