layouts: most-positive/negative-fixnum return fixnums now

diff --git a/core/layouts/layouts-tests.factor b/core/layouts/layouts-tests.factor
index 5a39f2462742afb8e2e93f04dad2242032aa61a9..f38d0aaa1ae9de83b0f77d6485f4400d7123b68f 100644 (file)
--- a/core/layouts/layouts-tests.factor
+++ b/core/layouts/layouts-tests.factor
@@ -6,3 +6,6 @@ IN: system.tests
 \r
 ! Smoke test\r
 [ t ] [ max-array-capacity cell-bits 2^ < ] unit-test\r
+\r
+[ t ] [ most-negative-fixnum fixnum? ] unit-test\r
+[ t ] [ most-positive-fixnum fixnum? ] unit-test\r

diff --git a/core/layouts/layouts.factor b/core/layouts/layouts.factor
index 5738c2ec99ac0089964d335192af95f8b51ecff5..4aa806c81f6505527beeff74a877220c2208914b 100644 (file)
--- a/core/layouts/layouts.factor
+++ b/core/layouts/layouts.factor
@@ -49,10 +49,10 @@ SYMBOL: mega-cache-size
     cell-bits (first-bignum) ; inline
 
 : most-positive-fixnum ( -- n )
-    first-bignum 1 - ; inline
+    first-bignum 1 - >fixnum ; inline
 
 : most-negative-fixnum ( -- n )
-    first-bignum neg ; inline
+    first-bignum neg >fixnum ; inline
 
 : (max-array-capacity) ( b -- n )
     5 - 2^ 1 - ; inline

diff --git a/extra/bloom-filters/bloom-filters.factor b/extra/bloom-filters/bloom-filters.factor
index 308d10ad84dea6ced01686dbc70bae2663cbc865..ad24d74adffb00bd481869b37efaae500870009f 100644 (file)
--- a/extra/bloom-filters/bloom-filters.factor
+++ b/extra/bloom-filters/bloom-filters.factor
@@ -127,7 +127,7 @@ PRIVATE>
 
 ! Make sure it's a fixnum here to speed up double-hashing.
 : hashcodes-from-hashcode ( n -- n n )
-    dup most-positive-fixnum >fixnum bitxor ;
+    dup most-positive-fixnum bitxor ;
 
 : hashcodes-from-object ( obj -- n n )
     hashcode abs hashcodes-from-hashcode ;

diff --git a/extra/project-euler/044/044.factor b/extra/project-euler/044/044.factor
index 46dff1ab235f434e3ab2ef115a153a4c0596e201..6460fcf97097b44447933fff36f5f5097978125a 100644 (file)
--- a/extra/project-euler/044/044.factor
+++ b/extra/project-euler/044/044.factor
@@ -41,7 +41,7 @@ IN: project-euler.044
 PRIVATE>
 
 : euler044 ( -- answer )
-    most-positive-fixnum >fixnum
+    most-positive-fixnum
     2500 [1,b] [
         dup [1,b] [
             euler044-step