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

ruby-changes:12331

From: nobu <ko1@a...>
Date: Sat, 11 Jul 2009 00:12:04 +0900 (JST)
Subject: [ruby-changes:12331] Ruby:r24026 (trunk): * array.c (ary_join_1): should recurse for element array.

nobu	2009-07-11 00:11:43 +0900 (Sat, 11 Jul 2009)

  New Revision: 24026

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

  Log:
    * array.c (ary_join_1): should recurse for element array.

  Modified files:
    trunk/ChangeLog
    trunk/array.c
    trunk/test/ruby/test_array.rb
    trunk/version.h

Index: array.c
===================================================================
--- array.c	(revision 24025)
+++ array.c	(revision 24026)
@@ -1570,6 +1570,7 @@
 	    rb_str_buf_append(result, val);
 	    break;
 	  case T_ARRAY:
+	    obj = val;
 	  ary_join:
 	    if (val == ary) {
 		val = rb_usascii_str_new2("[...]");
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 24025)
+++ ChangeLog	(revision 24026)
@@ -1,3 +1,7 @@
+Sat Jul 11 00:11:38 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (ary_join_1): should recurse for element array.
+
 Fri Jul 10 23:10:11 2009  NARUSE, Yui  <naruse@r...>
 
 	* io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.
Index: version.h
===================================================================
--- version.h	(revision 24025)
+++ version.h	(revision 24026)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-07-10"
+#define RUBY_RELEASE_DATE "2009-07-11"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: test/ruby/test_array.rb
===================================================================
--- test/ruby/test_array.rb	(revision 24025)
+++ test/ruby/test_array.rb	(revision 24026)
@@ -1496,6 +1496,7 @@
       [self]
     end
     assert_equal("[...]", [a].join, '[ruby-core:24150]')
+    assert_equal("12345", [1,[2,[3,4],5]].join)
   end
 
   def test_to_a2

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

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