From d946d0a66c41860d9ffbe56491508288ef41e0a8 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 30 Jun 2005 16:46:13 +0000 Subject: * enum.c (enum_min, enum_max): must not return Qundef. fixed: [ruby-core:05299] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 9 +++++++-- enum.c | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f90de3c..6d58f8dee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jul 1 01:45:21 2005 Nobuyoshi Nakada + + * enum.c (enum_min, enum_max): must not return Qundef. + fixed: [ruby-core:05299] + Fri Jul 1 00:18:40 2005 Yukihiro Matsumoto * lib/delegate.rb (Delegator::respond_to): respond_to? must check @@ -5,8 +10,8 @@ Fri Jul 1 00:18:40 2005 Yukihiro Matsumoto Thu Jun 30 19:00:21 2005 Keiju Ishitsuka * lib/irb/ruby-lex.rb (RubyLex::identify_number): alternative implements - for [ruby-dev:26410]. And support a numeric form of 0d99999. - + for [ruby-dev:26410]. And support a numeric form of 0d99999. + Thu Jun 30 17:28:10 2005 Yukihiro Matsumoto * lib/irb/ruby-lex.rb (RubyLex::identify_number): should not treat diff --git a/enum.c b/enum.c index 102257fa7..a50de77a9 100644 --- a/enum.c +++ b/enum.c @@ -660,6 +660,7 @@ enum_min(obj) VALUE result = Qundef; rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result); + if (result == Qundef) return Qnil; return result; } @@ -736,6 +737,7 @@ enum_max(obj) VALUE result = Qundef; rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result); + if (result == Qundef) return Qnil; return result; } -- cgit