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

ruby-changes:19170

From: nagachika <ko1@a...>
Date: Tue, 29 Mar 2011 21:56:46 +0900 (JST)
Subject: [ruby-changes:19170] Ruby:r31209 (trunk): * string.c (rb_String): Kernel#String should call to_str before to_s.

nagachika	2011-03-29 21:56:40 +0900 (Tue, 29 Mar 2011)

  New Revision: 31209

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31209

  Log:
    * string.c (rb_String): Kernel#String should call to_str before to_s.

  Modified files:
    trunk/ChangeLog
    trunk/object.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31208)
+++ ChangeLog	(revision 31209)
@@ -1,3 +1,7 @@
+Tue Mar 29 21:51:31 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* string.c (rb_String): Kernel#String should call to_str before to_s.
+
 Tue Mar 29 10:28:08 2011  NAKAMURA Usaku  <usa@r...>
 
 	* test/webrick/test_filehandler.rb
Index: object.c
===================================================================
--- object.c	(revision 31208)
+++ object.c	(revision 31209)
@@ -2360,7 +2360,10 @@
 VALUE
 rb_String(VALUE val)
 {
-    return rb_convert_type(val, T_STRING, "String", "to_s");
+    VALUE tmp = rb_check_string_type(val);
+    if (NIL_P(tmp))
+	tmp = rb_convert_type(val, T_STRING, "String", "to_s");
+    return tmp;
 }
 
 

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

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