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

* numeric.c (int_dotimes): Support for Integer#times.size

Browse Source 
[Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:15:30 +00:00
parent c2dc0dc1ce
commit 3a4eb4dd39
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
numeric.c
View File

@ -3473,6 +3473,18 @@ int_downto(VALUE from, VALUE to)
return from; return from;
} }
static VALUE
int_dotimes_size(VALUE num)
{
if (FIXNUM_P(num)) {
if (NUM2LONG(num) <= 0) return INT2FIX(0);
}
else {
if (RTEST(rb_funcall(num, '<', 1, INT2FIX(0)))) return INT2FIX(0);
}
return num;
}
/* /*
* call-seq: * call-seq:
* int.times {|i| block } -> self * int.times {|i| block } -> self
@ -3495,7 +3507,7 @@ int_downto(VALUE from, VALUE to)
static VALUE static VALUE
int_dotimes(VALUE num) int_dotimes(VALUE num)
{ {
RETURN_ENUMERATOR(num, 0, 0); RETURN_SIZED_ENUMERATOR(num, 0, 0, int_dotimes_size);
if (FIXNUM_P(num)) { if (FIXNUM_P(num)) {
long i, end; long i, end;

1
test/ruby/test_enumerator.rb
View File

@ -506,6 +506,7 @@ class TestEnumerator < Test::Unit::TestCase
def test_size_for_loops def test_size_for_loops
assert_equal Float::INFINITY, loop.size assert_equal Float::INFINITY, loop.size
assert_equal 42, 42.times.size
end end
def test_size_for_each_slice def test_size_for_each_slice