ruby-changes:12072
From: matz <ko1@a...>
Date: Fri, 19 Jun 2009 17:19:31 +0900 (JST)
Subject: [ruby-changes:12072] Ruby:r23742 (trunk): * numeric.c (flo_cmp): should always return nil for NaN.
matz 2009-06-19 17:19:14 +0900 (Fri, 19 Jun 2009) New Revision: 23742 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23742 Log: * numeric.c (flo_cmp): should always return nil for NaN. * numeric.c (flo_cmp): handle infinite value specially using infinite? method internally. [ruby-dev:38681] Modified files: trunk/ChangeLog trunk/numeric.c Index: ChangeLog =================================================================== --- ChangeLog (revision 23741) +++ ChangeLog (revision 23742) @@ -1,3 +1,10 @@ +Fri Jun 19 17:04:59 2009 Yukihiro Matsumoto <matz@r...> + + * numeric.c (flo_cmp): should always return nil for NaN. + + * numeric.c (flo_cmp): handle infinite value specially using + infinite? method internally. [ruby-dev:38681] + Fri Jun 19 09:28:45 2009 Tadayoshi Funaba <tadf@d...> * numeric.c (*_numerator,*_denominator): moved to rational.c. Index: numeric.c =================================================================== --- numeric.c (revision 23741) +++ numeric.c (revision 23742) @@ -937,6 +937,7 @@ double a, b; a = RFLOAT_VALUE(x); + if (isnan(a)) return Qnil; switch (TYPE(y)) { case T_FIXNUM: b = (double)FIX2LONG(y); @@ -955,6 +956,11 @@ break; default: + if (isinf(a) && (!rb_respond_to(y, rb_intern("infinite?")) || + !RTEST(rb_funcall(y, rb_intern("infinite?"), 0, 0)))) { + if (a > 0.0) return INT2FIX(1); + return INT2FIX(-1); + } return rb_num_coerce_cmp(x, y, rb_intern("<=>")); } return rb_dbl_cmp(a, b); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/