diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | bignum.c | 2 | ||||
-rw-r--r-- | numeric.c | 15 |
3 files changed, 17 insertions, 6 deletions
@@ -19,6 +19,12 @@ Sat Jul 23 10:01:41 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * missing/vsnprintf.c: made the output changeable. +Fri Jul 22 21:06:08 2005 Tadashi Saito <shiba@mail2.accsnet.ne.jp> + + * bignum.c (rb_big_eq): reduce isnan(). [ruby-dev:26600] + + * numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto. + Fri Jul 22 15:02:39 2005 Kouhei Sutou <kou@cozmixng.org> * lib/rss/rss.rb: moved copyright description to lib/rss.rb. @@ -983,8 +983,8 @@ rb_big_eq(x, y) volatile double a, b; a = RFLOAT(y)->value; + if (isnan(a)) return Qfalse; b = rb_big2dbl(x); - if (isnan(a) || isnan(b)) return Qfalse; return (a == b)?Qtrue:Qfalse; } default: @@ -833,12 +833,13 @@ flo_eq(x, y) break; case T_FLOAT: b = RFLOAT(y)->value; + if (isnan(b)) return Qfalse; break; default: return num_equal(x, y); } a = RFLOAT(x)->value; - if (isnan(a) || isnan(b)) return Qfalse; + if (isnan(a)) return Qfalse; return (a == b)?Qtrue:Qfalse; } @@ -938,12 +939,13 @@ flo_gt(x, y) case T_FLOAT: b = RFLOAT(y)->value; + if (isnan(b)) return Qfalse; break; default: return rb_num_coerce_relop(x, y); } - if (isnan(a) || isnan(b)) return Qfalse; + if (isnan(a)) return Qfalse; return (a > b)?Qtrue:Qfalse; } @@ -973,12 +975,13 @@ flo_ge(x, y) case T_FLOAT: b = RFLOAT(y)->value; + if (isnan(b)) return Qfalse; break; default: return rb_num_coerce_relop(x, y); } - if (isnan(a) || isnan(b)) return Qfalse; + if (isnan(a)) return Qfalse; return (a >= b)?Qtrue:Qfalse; } @@ -1007,12 +1010,13 @@ flo_lt(x, y) case T_FLOAT: b = RFLOAT(y)->value; + if (isnan(b)) return Qfalse; break; default: return rb_num_coerce_relop(x, y); } - if (isnan(a) || isnan(b)) return Qfalse; + if (isnan(a)) return Qfalse; return (a < b)?Qtrue:Qfalse; } @@ -1042,12 +1046,13 @@ flo_le(x, y) case T_FLOAT: b = RFLOAT(y)->value; + if (isnan(b)) return Qfalse; break; default: return rb_num_coerce_relop(x, y); } - if (isnan(a) || isnan(b)) return Qfalse; + if (isnan(a)) return Qfalse; return (a <= b)?Qtrue:Qfalse; } |