1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* enumerator.c (enumerator_with_object, Init_Enumerator):

Temporarily back out with_memo, for which we need a better name.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-06-16 00:49:25 +00:00
parent 959383cb10
commit a938a52126
3 changed files with 13 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Mon Jun 16 09:43:27 2008 Akinori MUSHA <knu@iDaemons.org>
* enumerator.c (enumerator_with_object, Init_Enumerator):
Temporarily back out with_memo, for which we need a better name.
Mon Jun 16 07:14:48 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/stringio/stringio.c (strio_readline, strio_each)

View file

@ -107,7 +107,6 @@ Compatible
* Enumerable and Enumerator
o Enumerable#map,collect_all called without a block returns
an enumerator.
o Enumerable::Enumerator#with_memo
* Regexp#match, String#match
o Regexp#match, String#match
* Fiber: coroutines/micro-threads

View file

@ -357,15 +357,15 @@ enumerator_with_index(VALUE obj)
}
static VALUE
enumerator_with_memo_i(VALUE val, VALUE memo)
enumerator_with_object_i(VALUE val, VALUE memo)
{
return rb_yield_values(2, val, memo);
}
/*
* call-seq:
* e.with_memo(obj) {|(*args), memo_obj| ... }
* e.with_memo(obj)
* e.with_object(obj) {|(*args), memo_obj| ... }
* e.with_object(obj)
*
* Iterates the given block for each element with an arbitrary
* object given, and returns the memo object.
@ -374,7 +374,7 @@ enumerator_with_memo_i(VALUE val, VALUE memo)
*
*/
static VALUE
enumerator_with_memo(VALUE obj, VALUE memo)
enumerator_with_object(VALUE obj, VALUE memo)
{
struct enumerator *e;
int argc = 0;
@ -387,7 +387,7 @@ enumerator_with_memo(VALUE obj, VALUE memo)
argv = RARRAY_PTR(e->args);
}
rb_block_call(e->obj, e->meth, argc, argv,
enumerator_with_memo_i, memo);
enumerator_with_object_i, memo);
return memo;
}
@ -489,7 +489,9 @@ Init_Enumerator(void)
rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
rb_define_method(rb_cEnumerator, "each_with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
rb_define_method(rb_cEnumerator, "with_memo", enumerator_with_memo, 1);
#if 0
rb_define_method(rb_cEnumerator, "with_object", enumerator_with_object, 1);
#endif
rb_define_method(rb_cEnumerator, "next", enumerator_next, 0);
rb_define_method(rb_cEnumerator, "rewind", enumerator_rewind, 0);