layouts: rename 32bit? and 64bit? to 32-bit? and 64-bit?

diff --git a/basis/cocoa/types/types.factor b/basis/cocoa/types/types.factor
index 43e0a238aea77cfae05a75e5794b68bac54f7b4a..5eba022cc8de146cda56e3e88747a9dc88cfece5 100644 (file)
--- a/basis/cocoa/types/types.factor
+++ b/basis/cocoa/types/types.factor
@@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax classes.struct cocoa.runtime
 core-graphics.types kernel literals layouts ;
 IN: cocoa.types
 
-CONSTANT: NSNotFound $[ 32bit? 0x7fffffff 0x7fffffffffffffff ? ]
+CONSTANT: NSNotFound $[ 32-bit? 0x7fffffff 0x7fffffffffffffff ? ]
 
 TYPEDEF: long NSInteger
 TYPEDEF: ulong NSUInteger

diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor
index 1e6f85f92e7a0a9d9bc5674478b4cacb7d854179..9ff30710b5feea4ded461b043187ff74f5742beb 100644 (file)
--- a/basis/compiler/tree/cleanup/cleanup-tests.factor
+++ b/basis/compiler/tree/cleanup/cleanup-tests.factor
@@ -225,7 +225,7 @@ M: float detect-float ;
     { shift fixnum-shift } inlined?
 ] unit-test
 
-32bit? [
+32-bit? [
     [ t ] [
         [ { fixnum fixnum } declare 1 swap 31 bitand shift ]
         \ shift inlined?

diff --git a/basis/compiler/tree/propagation/propagation-tests.factor b/basis/compiler/tree/propagation/propagation-tests.factor
index e8fdf70bc251894d95b0471c58ddd3c806a41bed..52016efa8794069babd92a556ff99ce283019bbc 100644 (file)
--- a/basis/compiler/tree/propagation/propagation-tests.factor
+++ b/basis/compiler/tree/propagation/propagation-tests.factor
@@ -538,7 +538,7 @@ IN: compiler.tree.propagation.tests
     [ { fixnum } declare 1 swap 7 bitand >bignum shift ] final-classes
 ] unit-test
 
-32bit? [
+32-bit? [
     [ V{ integer } ] [
         [ { fixnum } declare 1 swap 31 bitand shift ]
         final-classes

diff --git a/basis/images/loader/loader-tests.factor b/basis/images/loader/loader-tests.factor
index 26a83c010cef472e4fbe862a88945fe6436c5196..a1c19eea7b70d5aa69f3d60418aa10cae1f9d650 100644 (file)
--- a/basis/images/loader/loader-tests.factor
+++ b/basis/images/loader/loader-tests.factor
@@ -42,7 +42,7 @@ os { linux windows } member? [
 
     ! Windows 32 can't save .bmp-files for unknown reason. It can load
     ! them though.
-    64bit? [
+    64-bit? [
         { t } [
             open-png-image dup "bmp" convert-to =
         ] unit-test

diff --git a/core/layouts/layouts.factor b/core/layouts/layouts.factor
index f72bb3bcd4a541261c8b13594928b37c41a09276..c0c9a277ddb2c79c5bd95441ce3d337af14bab37 100644 (file)
--- a/core/layouts/layouts.factor
+++ b/core/layouts/layouts.factor
@@ -48,9 +48,9 @@ SYMBOL: header-bits
 
 : cell-bits ( -- n ) 8 cells ; inline
 
-: 32bit? ( -- ? ) cell-bits 32 = ; inline
+: 32-bit? ( -- ? ) cell-bits 32 = ; inline
 
-: 64bit? ( -- ? ) cell-bits 64 = ; inline
+: 64-bit? ( -- ? ) cell-bits 64 = ; inline
 
 : bootstrap-cell ( -- n ) \ cell get cell or ; inline