use radix literals

[factor.git] / core / math / floats / floats.factor

diff --git a/core/math/floats/floats.factor b/core/math/floats/floats.factor
index bc419b94c52dde3c4ae9d3d5db0a4e9595cf30d4..b441276a886631046fcb2952f45fdace1a8a5d99 100644 (file)
--- a/core/math/floats/floats.factor
+++ b/core/math/floats/floats.factor
@@ -1,15 +1,12 @@
-! Copyright (C) 2004, 2009 Slava Pestov, Joe Groff.
+! Copyright (C) 2004, 2010 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math math.private ;
+USING: kernel math math.private math.order ;
 IN: math.floats.private
 
-: float-unordered? ( x y -- ? ) [ fp-nan? ] bi@ or ;
+: float-unordered? ( x y -- ? ) [ fp-nan? ] either? ;
 : float-min ( x y -- z ) [ float< ] most ; foldable
 : float-max ( x y -- z ) [ float> ] most ; foldable
 
-M: fixnum >float fixnum>float ; inline
-M: bignum >float bignum>float ; inline
-
 M: float >fixnum float>fixnum ; inline
 M: float >bignum float>bignum ; inline
 M: float >float ; inline
@@ -29,18 +26,20 @@ M: float u<= float-u<= ; inline
 M: float u>  float-u> ; inline
 M: float u>= float-u>= ; inline
 
+M: float min over float? [ float-min ] [ call-next-method ] if ; inline
+M: float max over float? [ float-max ] [ call-next-method ] if ; inline
+
 M: float + float+ ; inline
 M: float - float- ; inline
 M: float * float* ; inline
 M: float / float/f ; inline
 M: float /f float/f ; inline
 M: float /i float/f >integer ; inline
-M: float mod float-mod ; inline
 
 M: real abs dup 0 < [ neg ] when ; inline
 
 M: float fp-special?
-    double>bits -52 shift HEX: 7ff [ bitand ] keep = ; inline
+    double>bits -52 shift 0x7ff [ bitand ] keep = ; inline
 
 M: float fp-nan-payload
     double>bits 52 2^ 1 - bitand ; inline