yugui	2008-11-04 22:37:17 +0900 (Tue, 04 Nov 2008)

  New Revision: 20111

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

  Log:
    merges r20103 from trunk into ruby_1_9_1.
    * array.c (rb_ary_join): do not repeat self in a recursive array.
      [ruby-dev:37019]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/array.c

Index: ruby_1_9_1/array.c
===================================================================
--- ruby_1_9_1/array.c	(revision 20110)
+++ ruby_1_9_1/array.c	(revision 20111)
@@ -1487,7 +1487,10 @@
 	  case T_STRING:
 	    break;
 	  case T_ARRAY:
-	    {
+	    if (tmp == ary) {
+		tmp = rb_usascii_str_new2("[...]");
+	    }
+	    else {
 		VALUE args[2];
 
 		args[0] = tmp;
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20110)
+++ ruby_1_9_1/ChangeLog	(revision 20111)
@@ -1,3 +1,8 @@
+Tue Nov  4 03:28:31 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_join): do not repeat self in a recursive array.
+	  [ruby-dev:37019]
+
 Tue Nov  4 01:56:46 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/intern.h (rb_mutex_synchronize): fixed prototype.

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