summaryrefslogtreecommitdiff
path: root/enumerator.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 12:00:57 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-07-15 12:00:57 +0000
commit0d8ac23d2a2b03932c5e222c5209d1e1eb9d1947 (patch)
treeddf20cc918fa7cb3b8f0dec4cfabedf8485eaefa /enumerator.c
parent52cc8ef40d74007e010f36707b45e51cfbd14f0b (diff)
merges r24094 from trunk into ruby_1_9_1.
-- * enumerator.c (yielder_yield_i): use rb_proc_new instead of rb_iterate. [ruby-dev:38518] * README.EXT: rb_iterate is obsolete since 1.9; use rb_block_call instead. * README.EXT.ja: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
-rw-r--r--enumerator.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/enumerator.c b/enumerator.c
index b952808764..f153de4069 100644
--- a/enumerator.c
+++ b/enumerator.c
@@ -637,12 +637,6 @@ yielder_yield(VALUE obj, VALUE args)
}
static VALUE
-yielder_new_i(VALUE dummy)
-{
- return yielder_init(yielder_allocate(rb_cYielder), rb_block_proc());
-}
-
-static VALUE
yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv)
{
return rb_yield_values2(argc, argv);
@@ -651,7 +645,7 @@ yielder_yield_i(VALUE obj, VALUE memo, int argc, VALUE *argv)
static VALUE
yielder_new(void)
{
- return rb_iterate(yielder_new_i, (VALUE)0, yielder_yield_i, (VALUE)0);
+ return yielder_init(yielder_allocate(rb_cYielder), rb_proc_new(yielder_yield_i, 0));
}
/*