From de09046e38faef6876e3e9c451aedb771e4af07c Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 4 Nov 2008 13:37:17 +0000 Subject: 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] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- array.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'array.c') diff --git a/array.c b/array.c index 2f5a194e8..5553b8ff2 100644 --- a/array.c +++ b/array.c @@ -1487,7 +1487,10 @@ rb_ary_join(VALUE ary, VALUE sep) case T_STRING: break; case T_ARRAY: - { + if (tmp == ary) { + tmp = rb_usascii_str_new2("[...]"); + } + else { VALUE args[2]; args[0] = tmp; -- cgit