* bignum.c (rb_big_eq): reduce isnan(). [ruby-dev:26600]

* numeric.c (flo_eq, flo_gt, flo_ge, flo_lt, flo_le): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@8823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 5 deletions

diff --git a/numeric.c b/numeric.c
index e5a03e1a8..eb528e932 100644
--- a/numeric.c
+++ b/numeric.c
@@ -832,12 +832,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;
 }
 
@@ -937,12 +938,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;
 }
 
@@ -972,12 +974,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;
 }
 
@@ -1006,12 +1009,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;
 }
 
@@ -1041,12 +1045,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;
 }