From 8f7b86edfce80048b1f3e3db60854f903ad06fc9 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 19 Jun 2009 08:19:14 +0000 Subject: * 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: http://svn.ruby-lang.org/repos/ruby/trunk@23742 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- numeric.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'numeric.c') diff --git a/numeric.c b/numeric.c index 6ff074e04..8ba7d3fd7 100644 --- a/numeric.c +++ b/numeric.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); -- cgit