From 3e27d06914fd57f50657bc1469d19dc84073a5da Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Date: Tue, 29 Sep 2009 22:27:54 -0500
Subject: [PATCH] layouts: most-positive/negative-fixnum return fixnums now

---
 core/layouts/layouts-tests.factor        | 3 +++
 core/layouts/layouts.factor              | 4 ++--
 extra/bloom-filters/bloom-filters.factor | 2 +-
 extra/project-euler/044/044.factor       | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/layouts/layouts-tests.factor b/core/layouts/layouts-tests.factor
index 5a39f24627..f38d0aaa1a 100644
--- a/core/layouts/layouts-tests.factor
+++ b/core/layouts/layouts-tests.factor
@@ -6,3 +6,6 @@ IN: system.tests
 
 ! Smoke test
 [ t ] [ max-array-capacity cell-bits 2^ < ] unit-test
+
+[ t ] [ most-negative-fixnum fixnum? ] unit-test
+[ t ] [ most-positive-fixnum fixnum? ] unit-test
diff --git a/core/layouts/layouts.factor b/core/layouts/layouts.factor
index 5738c2ec99..4aa806c81f 100644
--- 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 308d10ad84..ad24d74adf 100644
--- 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 46dff1ab23..6460fcf970 100644
--- 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