kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enum.c (enum_join): remove Enumerable#join. [ruby-core:24786]

Browse source 
* array.c (ary_join_1): use #to_ary to detect recursive array.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26906 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2010-03-13 05:55:46 +00:00
parent b1bf026f48
commit 8b55878d2a
5 changed files with 8 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Mar 13 14:49:55 2010 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (enum_join): remove Enumerable#join. [ruby-core:24786]
* array.c (ary_join_1): use #to_ary to detect recursive array.
Sat Mar 13 12:26:13 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/io.h (MakeOpenFile): finalize fptr get rid of

2
array.c
View file

@ -1604,7 +1604,7 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result)
val = tmp;
goto str_join;
}
tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_a");
tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary");
if (!NIL_P(tmp)) {
obj = val;
val = tmp;

20
enum.c
View file

@ -2522,25 +2522,6 @@ enum_slice_before(int argc, VALUE *argv, VALUE enumerable)
return enumerator;
}
/*
* call-seq:
* enum.join(sep=$,) -> str
*
* Returns a string created by converting each element of the
* <i>enum</i> to a string, separated by <i>sep</i>.
*/
static VALUE
enum_join(int argc, VALUE *argv, VALUE obj)
{
VALUE sep;
rb_scan_args(argc, argv, "01", &sep);
if (NIL_P(sep)) sep = rb_output_fs;
return rb_ary_join(enum_to_a(0, 0, obj), sep);
}
/*
* The <code>Enumerable</code> mixin provides collection classes with
* several traversal and searching methods, and with the ability to
@ -2606,7 +2587,6 @@ Init_Enumerable(void)
rb_define_method(rb_mEnumerable, "drop", enum_drop, 1);
rb_define_method(rb_mEnumerable, "drop_while", enum_drop_while, 0);
rb_define_method(rb_mEnumerable, "cycle", enum_cycle, -1);
rb_define_method(rb_mEnumerable, "join", enum_join, -1);
rb_define_method(rb_mEnumerable, "chunk", enum_chunk, -1);
rb_define_method(rb_mEnumerable, "slice_before", enum_slice_before, -1);

2
test/ruby/test_array.rb
View file

@ -1565,7 +1565,7 @@ class TestArray < Test::Unit::TestCase
a << a
assert_raise(ArgumentError){a.join}
def (a = Object.new).to_a
def (a = Object.new).to_ary
[self]
end
assert_raise(ArgumentError, '[ruby-core:24150]'){[a].join}

32
test/ruby/test_enum.rb
View file

@ -311,38 +311,6 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal([2,1,3,2,1], @obj.reverse_each.to_a)
end
def test_join
ofs = $,
assert_equal("abc", ("a".."c").join(""))
assert_equal("a-b-c", ("a".."c").join("-"))
$, = "-"
assert_equal("a-b-c", ("a".."c").join())
$, = nil
assert_equal("abc", ("a".."c").join())
assert_equal("123", (1..3).join())
assert_raise(TypeError, '[ruby-core:24172]') {("a".."c").join(1)}
class << (e = Object.new.extend(Enumerable))
def each
yield self
end
end
assert_raise(ArgumentError){e.join("")}
assert_raise(ArgumentError){[e].join("")}
e = Class.new {
include Enumerable
def initialize(*args)
@e = args
end
def each
@e.each {|e| yield e}
end
}
e = e.new(1, e.new(2, e.new(3, e.new(4, 5))))
assert_equal("1:2:3:4:5", e.join(':'), '[ruby-core:24196]')
ensure
$, = ofs
end
def test_chunk
e = [].chunk {|elt| true }
assert_equal([], e.to_a)