summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--enum.c6
-rw-r--r--test/ruby/test_enum.rb30
3 files changed, 40 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b50927..0a2afc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue May 12 22:18:27 2015 Masaki Matsushita <glass.saga@gmail.com>
+
+ * enum.c (enum_to_a): fix incompatibility introduced in r50457.
+ [Bug #11130]
+
+ * test/ruby/test_enum.rb: test for above.
+
Tue May 12 17:08:03 2015 Koichi Sasada <ko1@atdot.net>
* method.h: remove unused declaration.
diff --git a/enum.c b/enum.c
index ea151b4..2516934 100644
--- a/enum.c
+++ b/enum.c
@@ -517,11 +517,11 @@ enum_to_a(int argc, VALUE *argv, VALUE obj)
{
VALUE ary, size = rb_check_funcall(obj, id_size, 0, 0);
- if (NIL_P(size) || size == Qundef) {
- ary = rb_ary_new();
+ if (FIXNUM_P(size)) {
+ ary = rb_ary_new_capa(NUM2LONG(size));
}
else {
- ary = rb_ary_new_capa(NUM2LONG(size));
+ ary = rb_ary_new();
}
rb_block_call(obj, id_each, argc, argv, collect_all, ary);
diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb
index 8b9a8c3..6961187 100644
--- a/test/ruby/test_enum.rb
+++ b/test/ruby/test_enum.rb
@@ -100,6 +100,36 @@ class TestEnumerable < Test::Unit::TestCase
assert_equal([1, 2, 3, 1, 2], @obj.to_a)
end
+ def test_to_a_size_symbol
+ sym = Object.new
+ class << sym
+ include Enumerable
+ def each
+ self
+ end
+
+ def size
+ :size
+ end
+ end
+ assert_equal([], sym.to_a)
+ end
+
+ def test_to_a_size_infinity
+ inf = Object.new
+ class << inf
+ include Enumerable
+ def each
+ self
+ end
+
+ def size
+ Float::INFINITY
+ end
+ end
+ assert_equal([], inf.to_a)
+ end
+
def test_to_h
obj = Object.new
def obj.each(*args)