1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24026 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-07-10 15:11:43 +00:00
parent 161f0a1699
commit 38867cc115
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sat Jul 11 00:11:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (ary_join_1): should recurse for element array.
Fri Jul 10 23:10:11 2009 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (io_strip_bom): ungetbyte third byte when UTF-16LE.

1
array.c
View File

@ -1570,6 +1570,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
rb_str_buf_append(result, val);
break;
case T_ARRAY:
obj = val;
ary_join:
if (val == ary) {
val = rb_usascii_str_new2("[...]");

1
test/ruby/test_array.rb
View File

@ -1496,6 +1496,7 @@ class TestArray < Test::Unit::TestCase
[self]
end
assert_equal("[...]", [a].join, '[ruby-core:24150]')
assert_equal("12345", [1,[2,[3,4],5]].join)
end
def test_to_a2

4
version.h
View File

@ -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"