From 7ac200dc2bf979ff4a43c4802804625cb8390524 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sat, 22 Jan 2022 11:09:37 -0800 Subject: [PATCH] layouts: rename 32bit? and 64bit? to 32-bit? and 64-bit? --- basis/cocoa/types/types.factor | 2 +- basis/compiler/tree/cleanup/cleanup-tests.factor | 2 +- basis/compiler/tree/propagation/propagation-tests.factor | 2 +- basis/images/loader/loader-tests.factor | 2 +- core/layouts/layouts.factor | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/cocoa/types/types.factor b/basis/cocoa/types/types.factor index 43e0a238ae..5eba022cc8 100644 --- 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 1e6f85f92e..9ff30710b5 100644 --- 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 e8fdf70bc2..52016efa87 100644 --- 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 26a83c010c..a1c19eea7b 100644 --- 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 f72bb3bcd4..c0c9a277dd 100644 --- 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 -- 2.34.1