diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-19 08:19:14 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-19 08:19:14 +0000 |
commit | cdba56b38ad83496b654bba626c7dc44140a0938 (patch) | |
tree | 6d74c396fc6afd2805fde09b4fbeec0794299597 | |
parent | 5134783cdef392aa47692f95427affe4fd59c6fa (diff) | |
download | ruby-cdba56b38ad83496b654bba626c7dc44140a0938.tar.gz |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | numeric.c | 6 |
2 files changed, 13 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Fri Jun 19 17:04:59 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * 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@dotrb.org> * numeric.c (*_numerator,*_denominator): moved to rational.c. @@ -937,6 +937,7 @@ flo_cmp(VALUE x, VALUE y) 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 @@ flo_cmp(VALUE x, VALUE y) 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); |