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_cycle): Support for Enumerable#cycle.size

Browse source 
[Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37510 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:13:19 +00:00
parent fe9386cdcb
commit cef054d5b2
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
enum.c
View file

@ -2235,6 +2235,24 @@ cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
return Qnil;
}
static VALUE
enum_cycle_size(VALUE self, VALUE args)
{
long mul;
VALUE n = Qnil;
VALUE size = enum_size(self, args);
if (size == Qnil) return Qnil;
if (args && (RARRAY_LEN(args) > 0)) {
n = RARRAY_PTR(args)[0];
}
if (n == Qnil) return DBL2NUM(INFINITY);
mul = NUM2LONG(n);
if (mul <= 0) return INT2FIX(0);
return rb_funcall(size, '*', 1, LONG2FIX(mul));
}
/*
* call-seq:
* enum.cycle(n=nil) { |obj| block } -> nil
@ -2265,7 +2283,7 @@ enum_cycle(int argc, VALUE *argv, VALUE obj)
rb_scan_args(argc, argv, "01", &nv);
RETURN_ENUMERATOR(obj, argc, argv);
RETURN_SIZED_ENUMERATOR(obj, argc, argv, enum_cycle_size);
if (NIL_P(nv)) {
n = -1;
}

5
test/ruby/test_enumerator.rb
View file

@ -477,6 +477,11 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 0, [:foo, :bar].cycle(-10).size
assert_equal 0, [].cycle.size
assert_equal 0, [].cycle(5).size
assert_equal nil, @obj.cycle.size
assert_equal nil, @obj.cycle(5).size
assert_equal Float::INFINITY, @sized.cycle.size
assert_equal 126, @sized.cycle(3).size
end
def test_size_for_loops