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

* enumerator.c (enumerator_by_slice): new method added.

Browse Source 
* enumerator.c (enumerator_by_cons): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11219 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-10-25 00:21:54 +00:00
parent f1e4b10a84
commit 805e130d20
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -7,6 +7,12 @@ Wed Oct 25 00:58:19 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/mkexports.rb, win32/resource.rb: use unique variable names. * win32/mkexports.rb, win32/resource.rb: use unique variable names.
Tue Oct 24 19:18:53 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* enumerator.c (enumerator_by_slice): new method added.
* enumerator.c (enumerator_by_cons): ditto.
Tue Oct 24 18:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Tue Oct 24 18:56:13 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* enumerator.c (enum_each_slice, enum_each_cons): returns * enumerator.c (enum_each_slice, enum_each_cons): returns

64
enumerator.c
View File

@ -313,6 +313,7 @@ enumerator_with_index(VALUE obj)
int argc = 0; int argc = 0;
VALUE *argv = 0; VALUE *argv = 0;
/* RETURN_ENUMERATOR(obj, 0, 0); ?? */
if (e->args) { if (e->args) {
argc = RARRAY_LEN(e->args); argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args); argv = RARRAY_PTR(e->args);
@ -321,6 +322,67 @@ enumerator_with_index(VALUE obj)
enumerator_with_index_i, (VALUE)&memo); enumerator_with_index_i, (VALUE)&memo);
} }
/*
* call-seq:
* e.by_slice {...}
*
* Iterates the given block for each slice of <n> elements.
*
*/
static VALUE
enumerator_by_slice(VALUE obj, VALUE n)
{
struct enumerator *e = enumerator_ptr(obj);
int argc = 0;
VALUE *argv = 0;
long size = NUM2LONG(n);
VALUE args[2], ary;
if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
RETURN_ENUMERATOR(obj, 1, &n);
args[0] = rb_ary_new2(size);
args[1] = (VALUE)size;
if (e->args) {
argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args);
}
return rb_block_call(e->method, rb_intern("call"), argc, argv,
each_slice_i, (VALUE)&args);
return Qnil;
}
/*
* call-seq:
* e.by_cons {...}
*
* Iterates the given block for each array of consecutive <n>
* elements.
*
*/
static VALUE
enumerator_by_cons(VALUE obj, VALUE n)
{
struct enumerator *e = enumerator_ptr(obj);
int argc = 0;
VALUE *argv = 0;
long size = NUM2LONG(n);
VALUE args[2], ary;
if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
RETURN_ENUMERATOR(obj, 1, &n);
args[0] = rb_ary_new2(size);
args[1] = (VALUE)size;
if (e->args) {
argc = RARRAY_LEN(e->args);
argv = RARRAY_PTR(e->args);
}
return rb_block_call(e->method, rb_intern("call"), argc, argv,
each_cons_i, (VALUE)&args);
return Qnil;
}
/* /*
* call-seq: * call-seq:
* e.to_splat => array * e.to_splat => array
@ -350,6 +412,8 @@ Init_Enumerator(void)
rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1); rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
rb_define_method(rb_cEnumerator, "each", enumerator_each, 0); rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0); rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "by_slice", enumerator_by_slice, 1);
rb_define_method(rb_cEnumerator, "by_cons", enumerator_by_cons, 1);
rb_define_method(rb_cEnumerator, "to_splat", enumerator_to_splat, 0); rb_define_method(rb_cEnumerator, "to_splat", enumerator_to_splat, 0);
sym_each = ID2SYM(rb_intern("each")); sym_each = ID2SYM(rb_intern("each"));