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

Browse source 
[Feature #6636]

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

16
enum.c
View file

@ -1849,6 +1849,20 @@ each_cons_i(VALUE i, VALUE args, int argc, VALUE *argv)
return v;
}
static VALUE
enum_each_cons_size(VALUE obj, VALUE args)
{
VALUE n, size;
long cons_size = NUM2LONG(RARRAY_PTR(args)[0]);
if (cons_size <= 0) rb_raise(rb_eArgError, "invalid size");
size = enum_size(obj, 0);
if (size == Qnil) return Qnil;
n = rb_funcall(size, '+', 1, LONG2NUM(1 - cons_size));
return (rb_cmpint(rb_funcall(n, id_cmp, 1, LONG2FIX(0)), n, LONG2FIX(0)) == -1) ? LONG2FIX(0) : n;
}
/*
* call-seq:
* enum.each_cons(n) { ... } -> nil
@ -1877,7 +1891,7 @@ enum_each_cons(VALUE obj, VALUE n)
NODE *memo;
if (size <= 0) rb_raise(rb_eArgError, "invalid size");
RETURN_ENUMERATOR(obj, 1, &n);
RETURN_SIZED_ENUMERATOR(obj, 1, &n, enum_each_cons_size);
memo = NEW_MEMO(rb_ary_new2(size), 0, size);
rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)memo);

7
test/ruby/test_enumerator.rb
View file

@ -490,5 +490,12 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 1, @sized.each_slice(70).size
assert_raise(ArgumentError){ @obj.each_slice(0).size }
end
def test_size_for_each_cons
assert_equal nil, @obj.each_cons(3).size
assert_equal 33, @sized.each_cons(10).size
assert_equal 0, @sized.each_cons(70).size
assert_raise(ArgumentError){ @obj.each_cons(0).size }
end
end