1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* numeric.c (flo_eq): remove unnecessary NaN check using isnan().

Browse Source 
comparison regarding NaN is false anyway.

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22579 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2009-02-23 17:15:17 +00:00
parent c43236eaf7
commit 60e8b398cd
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Feb 24 01:53:40 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* numeric.c (flo_eq): remove unnecessary NaN check using isnan().
comparison regarding NaN is false anyway.
* numeric.c (flo_gt, flo_ge, flo_lt, flo_le, flo_eql): ditto.
Tue Feb 24 01:22:19 2009 Yusuke Endoh <mame@tsg.ne.jp> Tue Feb 24 01:22:19 2009 Yusuke Endoh <mame@tsg.ne.jp>
* bootstraptest/test_thread.rb: fix for environment where fork is not * bootstraptest/test_thread.rb: fix for environment where fork is not

17
numeric.c
View File

@ -874,13 +874,11 @@ flo_eq(VALUE x, VALUE y)
break; break;
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
if (isnan(b)) return Qfalse;
break; break;
default: default:
return num_equal(x, y); return num_equal(x, y);
} }
a = RFLOAT_VALUE(x); a = RFLOAT_VALUE(x);
if (isnan(a)) return Qfalse;
return (a == b)?Qtrue:Qfalse; return (a == b)?Qtrue:Qfalse;
} }
@ -970,13 +968,11 @@ flo_gt(VALUE x, VALUE y)
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
if (isnan(b)) return Qfalse;
break; break;
default: default:
return rb_num_coerce_relop(x, y, '>'); return rb_num_coerce_relop(x, y, '>');
} }
if (isnan(a)) return Qfalse;
return (a > b)?Qtrue:Qfalse; return (a > b)?Qtrue:Qfalse;
} }
@ -1005,13 +1001,11 @@ flo_ge(VALUE x, VALUE y)
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
if (isnan(b)) return Qfalse;
break; break;
default: default:
return rb_num_coerce_relop(x, y, rb_intern(">=")); return rb_num_coerce_relop(x, y, rb_intern(">="));
} }
if (isnan(a)) return Qfalse;
return (a >= b)?Qtrue:Qfalse; return (a >= b)?Qtrue:Qfalse;
} }
@ -1039,13 +1033,11 @@ flo_lt(VALUE x, VALUE y)
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
if (isnan(b)) return Qfalse;
break; break;
default: default:
return rb_num_coerce_relop(x, y, '<'); return rb_num_coerce_relop(x, y, '<');
} }
if (isnan(a)) return Qfalse;
return (a < b)?Qtrue:Qfalse; return (a < b)?Qtrue:Qfalse;
} }
@ -1074,13 +1066,11 @@ flo_le(VALUE x, VALUE y)
case T_FLOAT: case T_FLOAT:
b = RFLOAT_VALUE(y); b = RFLOAT_VALUE(y);
if (isnan(b)) return Qfalse;
break; break;
default: default:
return rb_num_coerce_relop(x, y, rb_intern("<=")); return rb_num_coerce_relop(x, y, rb_intern("<="));
} }
if (isnan(a)) return Qfalse;
return (a <= b)?Qtrue:Qfalse; return (a <= b)?Qtrue:Qfalse;
} }
@ -1099,11 +1089,8 @@ static VALUE
flo_eql(VALUE x, VALUE y) flo_eql(VALUE x, VALUE y)
{ {
if (TYPE(y) == T_FLOAT) { if (TYPE(y) == T_FLOAT) {
double a = RFLOAT_VALUE(x); if (RFLOAT_VALUE(x) == RFLOAT_VALUE(y))
double b = RFLOAT_VALUE(y); return Qtrue;
if (isnan(a) || isnan(b)) return Qfalse;
if (a == b) return Qtrue;
} }
return Qfalse; return Qfalse;
} }