From eb0c96510a072f35ddcaf418d560e30786e5cef1 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 20 May 2003 06:29:23 +0000 Subject: * eval.c (rb_yield_0): give warning for multiple values for a block parameter. * eval.c (rb_yield_values): a function to yield multiple values. * array.c (sort_1): use rb_yield_values. * enum.c (min_ii, max_ii): ditto. * hash.c (rb_hash_update_block_i, delete_if_i, select_i, each_pair_i, env_each, env_reject_bang, env_select, env_update_i): ditto. * struct.c (rb_struct_each_pair): ditto. * eval.c (top_include): should include module in the current self, not ruby_top_self. [ruby-dev:20198] * eval.c (top_include): stop inclusion to ruby_wrapper; give warning. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3833 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index ddefbd6c2..71b2e7e76 100644 --- a/enum.c +++ b/enum.c @@ -397,7 +397,7 @@ min_ii(i, memo) memo->u1.value = i; } else { - cmp = rb_yield(rb_assoc_new(i, memo->u1.value)); + cmp = rb_yield_values(2, i, memo->u1.value); if (rb_cmpint(cmp, i, memo->u1.value) < 0) { memo->u1.value = i; } @@ -448,7 +448,7 @@ max_ii(i, memo) memo->u1.value = i; } else { - cmp = rb_yield(rb_assoc_new(i, memo->u1.value)); + cmp = rb_yield_values(2, i, memo->u1.value); if (rb_cmpint(cmp, i, memo->u1.value) > 0) { memo->u1.value = i; } -- cgit