use radix literals

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

diff --git a/core/math/math.factor b/core/math/math.factor
index e8f2813a959418d2408c37b5d2815a7edae7b8e0..81e488cb19b3fb5c23739b7ccc3411601d79dff0 100644 (file)
--- a/core/math/math.factor
+++ b/core/math/math.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2003, 2009 Slava Pestov, Joe Groff.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: kernel math.private ;
+USING: kernel ;
 IN: math
 
 GENERIC: >fixnum ( x -- n ) foldable
@@ -76,9 +76,9 @@ ERROR: log2-expects-positive x ;
 : if-zero ( ..a n quot1: ( ..a -- ..b ) quot2: ( ..a n -- ..b ) -- ..b )
     [ dup zero? ] [ [ drop ] prepose ] [ ] tri* if ; inline
 
-: when-zero ( n quot -- ) [ ] if-zero ; inline
+: when-zero ( ..a n quot: ( ..a -- ..b ) -- ..b ) [ ] if-zero ; inline
 
-: unless-zero ( n quot -- ) [ ] swap if-zero ; inline
+: unless-zero ( ..a n quot: ( ..a -- ..b ) -- ..b ) [ ] swap if-zero ; inline
 
 UNION: integer fixnum bignum ;
 
@@ -109,7 +109,7 @@ M: object fp-snan? drop f ; inline
 M: object fp-infinity? drop f ; inline
 
 : <fp-nan> ( payload -- nan )
-    HEX: 7ff0000000000000 bitor bits>double ; inline
+    0x7ff0000000000000 bitor bits>double ; inline
 
 GENERIC: next-float ( m -- n )
 GENERIC: prev-float ( m -- n )