[前][次][番号順一覧][スレッド一覧]

ruby-changes:5780

From: shyouhei <ko1@a...>
Date: Sun, 15 Jun 2008 22:48:55 +0900 (JST)
Subject: [ruby-changes:5780] Ruby:r17286 (ruby_1_8_6): merge revision(s) 16369:

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

  New Revision: 17286

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/lib/delegate.rb
    branches/ruby_1_8_6/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_6/ChangeLog?r1=17286&r2=17285&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/version.h?r1=17286&r2=17285&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_6/lib/delegate.rb?r1=17286&r2=17285&diff_format=u

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17285)
+++ ruby_1_8_6/ChangeLog	(revision 17286)
@@ -1,3 +1,11 @@
+Sun Jun 15 22:48:26 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:46:34 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* util.c (ruby_strtod): backported from 1.9.  a patch from Satoshi
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17285)
+++ ruby_1_8_6/version.h	(revision 17286)
@@ -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
Index: ruby_1_8_6/lib/delegate.rb
===================================================================
--- ruby_1_8_6/lib/delegate.rb	(revision 17285)
+++ ruby_1_8_6/lib/delegate.rb	(revision 17286)
@@ -228,13 +228,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
 
@@ -281,12 +283,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/

[前][次][番号順一覧][スレッド一覧]