layouts: change max-array-capacity to most-positive-fixnum

diff --git a/core/growable/growable.factor b/core/growable/growable.factor
index e6daa965a4cdae3cc709e0662c8cbd4556d5b019..e203b1a722ffcf4f808cad5e980c612d92c5156a 100644 (file)
--- a/core/growable/growable.factor
+++ b/core/growable/growable.factor
@@ -1,10 +1,9 @@
 ! Copyright (C) 2005, 2009 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors kernel math math.private sequences
-sequences.private ;
 IN: growable
-
-MIXIN: growable
+MIXIN: growable ! for bootstrap
+USING: accessors kernel layouts math math.private sequences
+sequences.private ;
 
 SLOT: length
 SLOT: underlying
@@ -46,7 +45,9 @@ M: growable set-length
     ] if
     length<< ;
 
-: new-size ( old -- new ) 1 + 2 * ; inline
+: new-size ( old -- new )
+    integer>fixnum-strict 1 fixnum+fast 2 fixnum*fast
+    dup 0 < [ drop most-positive-fixnum ] when ; inline
 
 : ensure ( n seq -- n seq )
     bounds-check-head

diff --git a/core/layouts/layouts.factor b/core/layouts/layouts.factor
index c0c9a277ddb2c79c5bd95441ce3d337af14bab37..ec9a0a90bd86e9279a082232328fd7b4e7cc34fc 100644 (file)
--- a/core/layouts/layouts.factor
+++ b/core/layouts/layouts.factor
@@ -73,11 +73,7 @@ SYMBOL: header-bits
 : most-negative-fixnum ( -- n )
     first-bignum neg >fixnum ; inline
 
-: (max-array-capacity) ( b -- n )
-    2 - 2^ 1 - ; inline
-
-: max-array-capacity ( -- n )
-    fixnum-bits (max-array-capacity) ; inline
+ALIAS: max-array-capacity most-positive-fixnum
 
 : bootstrap-first-bignum ( -- n )
     bootstrap-cell-bits (first-bignum) ;
@@ -88,8 +84,7 @@ SYMBOL: header-bits
 : bootstrap-most-negative-fixnum ( -- n )
     bootstrap-first-bignum neg ;
 
-: bootstrap-max-array-capacity ( -- n )
-    bootstrap-fixnum-bits (max-array-capacity) ;
+ALIAS: bootstrap-max-array-capacity bootstrap-most-positive-fixnum
 
 M: bignum >integer
     dup most-negative-fixnum most-positive-fixnum between?