* array.c (rb_ary_times): Array#* should return an instance of

  the class of right operand.  [ruby-dev:24526]

* ext/zlib/zlib.c (zstream_detach_buffer): should not expose
  class-less object to Ruby world. [ruby-dev:24530]

* eval.c (proc_dup): provide Proc#dup as well.  [ruby-talk:116915]

* eval.c (ruby_exec): stack marking position may be higher than
  expected.  thanks to Guy Decoux.  [ruby-core:03527]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7077 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/delegate.rb b/lib/delegate.rb
index c6f8f5d946..10b135116d 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -76,10 +76,14 @@ class SimpleDelegator<Delegator
     @_sd_obj = obj
   end
 
-  def initialize_copy(obj)
+  def clone(obj)
     super
     __setobj__(obj.__getobj__.clone)
   end
+  def dup(obj)
+    super
+    __setobj__(obj.__getobj__.dup)
+  end
 end
 
 # backward compatibility ^_^;;;
@@ -108,9 +112,13 @@ def DelegateClass(superclass)
     def __setobj__(obj)
       @_dc_obj = obj
     end
-    def initialize_copy(obj)
+    def clone(obj)
       super
-    __setobj__(obj.__getobj__.clone)
+      __setobj__(obj.__getobj__.clone)
+    end
+    def dup(obj)
+      super
+      __setobj__(obj.__getobj__.dup)
     end
   }
   for method in methods