From 9480c6b7206cbbddcfac5996b9efd249eb6bb0b4 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 25 Jun 2005 06:49:25 +0000 Subject: * enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore nil as the first element. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 19 ++++++++++++------- enum.c | 22 ++++++++++++---------- 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac1eaf9b5c..992689bbf5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,21 @@ +Sat Jun 25 15:49:18 2005 Nobuyoshi Nakada + + * enum.c (enum_min, enum_max, enum_min_by, enum_max_by): do not ignore + nil as the first element. + Sat Jun 25 15:13:54 2005 Hirokazu Yamamoto * lib/set.rb (Set#==): [ruby-dev:25206] (ported from ruby_1_8 branch) Sat Jun 25 11:37:00 2005 NARUSE, Yui - * ext/nkf/lib/kconv.rb: remove constants - Iconv_Shift_JIS, Uconv_EUC_JP, Iconv_UTF8 - * ext/nkf/lib/kconv.rb: add module functions to Kconv - conv, {eucjp, shiftjis, utf8}?, guess_as_symbol - * ext/nkf/lib/kconv.rb: add instance methods to String - conv, {eucjp, shiftjis, utf8}? - * ext/nkf/lib/kconv.rb: add aliases Kconv.to_* and String#to_* + * ext/nkf/lib/kconv.rb: remove constants + Iconv_Shift_JIS, Uconv_EUC_JP, Iconv_UTF8 + * ext/nkf/lib/kconv.rb: add module functions to Kconv + conv, {eucjp, shiftjis, utf8}?, guess_as_symbol + * ext/nkf/lib/kconv.rb: add instance methods to String + conv, {eucjp, shiftjis, utf8}? + * ext/nkf/lib/kconv.rb: add aliases Kconv.to_* and String#to_* Fri Jun 24 13:17:45 2005 akira yamada diff --git a/enum.c b/enum.c index 25432dc99a..ce9c918067 100644 --- a/enum.c +++ b/enum.c @@ -607,7 +607,7 @@ min_i(i, memo) { VALUE cmp; - if (NIL_P(*memo)) { + if (*memo == Qundef) { *memo = i; } else { @@ -626,7 +626,7 @@ min_ii(i, memo) { VALUE cmp; - if (NIL_P(*memo)) { + if (*memo == Qundef) { *memo = i; } else { @@ -657,7 +657,7 @@ static VALUE enum_min(obj) VALUE obj; { - VALUE result = Qnil; + VALUE result = Qundef; rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)&result); return result; @@ -670,7 +670,7 @@ max_i(i, memo) { VALUE cmp; - if (NIL_P(*memo)) { + if (*memo == Qundef) { *memo = i; } else { @@ -689,7 +689,7 @@ max_ii(i, memo) { VALUE cmp; - if (NIL_P(*memo)) { + if (*memo == Qundef) { *memo = i; } else { @@ -719,7 +719,7 @@ static VALUE enum_max(obj) VALUE obj; { - VALUE result = Qnil; + VALUE result = Qundef; rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)&result); return result; @@ -733,7 +733,7 @@ min_by_i(i, memo) VALUE v; v = rb_yield(i); - if (NIL_P(memo[0])) { + if (memo[0] == Qundef) { memo[0] = v; memo[1] = i; } @@ -762,7 +762,8 @@ enum_min_by(obj) VALUE memo[2]; rb_need_block(); - memo[0] = memo[1] = Qnil; + memo[0] = Qundef; + memo[1] = Qnil; rb_iterate(rb_each, obj, min_by_i, (VALUE)memo); return memo[1]; } @@ -775,7 +776,7 @@ max_by_i(i, memo) VALUE v; v = rb_yield(i); - if (NIL_P(memo[0])) { + if (memo[0] == Qundef) { memo[0] = v; memo[1] = i; } @@ -804,7 +805,8 @@ enum_max_by(obj) VALUE memo[2]; rb_need_block(); - memo[0] = memo[1] = Qnil; + memo[0] = Qundef; + memo[1] = Qnil; rb_iterate(rb_each, obj, max_by_i, (VALUE)memo); return memo[1]; } -- cgit v1.2.3