sequences: add ensure-non-negative word

diff --git a/basis/math/bits/bits.factor b/basis/math/bits/bits.factor
index 9764bbc40977576c010d5751de48978b937fc300..998ff0349cd009fd05d10313bb9ac5695a82e8aa 100644 (file)
--- a/basis/math/bits/bits.factor
+++ b/basis/math/bits/bits.factor
@@ -6,11 +6,8 @@ IN: math.bits
 TUPLE: bits { number read-only } { length read-only } ;
 C: <bits> bits
 
-: check-negative-bits ( n -- n )
-    dup 0 < [ non-negative-integer-expected ] when ; inline
-
 : make-bits ( number -- bits )
-    check-negative-bits
+    ensure-non-negative
     [ T{ bits f 0 1 } ] [ dup abs log2 1 + <bits> ] if-zero ; inline
 
 M: bits length length>> ; inline

diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor
index bf7f7ce19d5d19f126ee979c384da41e57afdfb2..30408bcf22a37d521e423e6aeafbcb5229cdaddd 100644 (file)
--- a/basis/math/bitwise/bitwise.factor
+++ b/basis/math/bitwise/bitwise.factor
@@ -134,7 +134,7 @@ PRIVATE>
 GENERIC: bit-count ( obj -- n )
 
 M: integer bit-count
-    dup 0 < [ non-negative-integer-expected ] when (bit-count) ; inline
+    ensure-non-negative (bit-count) ; inline
 
 M: byte-array bit-count
     byte-array-bit-count ;

diff --git a/core/sequences/sequences.factor b/core/sequences/sequences.factor
index ba053465e3d14665bc0a8ba80d52b2d2b7ea12ba..86f25581a6fc9721c6d2726d3bb9b2ca6ad102ee 100644 (file)
--- a/core/sequences/sequences.factor
+++ b/core/sequences/sequences.factor
@@ -143,9 +143,11 @@ TUPLE: iota { n integer read-only } ;
 
 ERROR: non-negative-integer-expected n ;
 
+: ensure-non-negative ( n -- n )
+    dup 0 < [ non-negative-integer-expected ] when ; inline
+
 : <iota> ( n -- iota )
-    dup 0 < [ non-negative-integer-expected ] when
-    iota boa ; inline
+    ensure-non-negative iota boa ; inline
 
 M: iota length n>> ; inline
 M: iota nth-unsafe drop ; inline

diff --git a/extra/base32-crockford/base32-crockford.factor b/extra/base32-crockford/base32-crockford.factor
index 644bd387b843f02779d43f927ef9f428ab5709c0..110f70229d3cc9b2e343818f4f2ff2734e1e8ae8 100644 (file)
--- a/extra/base32-crockford/base32-crockford.factor
+++ b/extra/base32-crockford/base32-crockford.factor
@@ -31,7 +31,7 @@ PRIVATE>
     normalize-base32 parse-base32 ;
 
 : >base32-crockford ( n -- base32 )
-    dup 0 < [ non-negative-integer-expected ] when
+    ensure-non-negative
     [ dup 0 > ] [ 32 /mod ALPHABET nth ] "" produce-as nip
     [ "0" ] when-empty reverse! ;
 

diff --git a/extra/math/extras/extras.factor b/extra/math/extras/extras.factor
index 92676835bca8f58cd02c725ac88aaee3732a9e80..4d65a2d386049f232cdc8e5b2d0677d7440db410 100644 (file)
--- a/extra/math/extras/extras.factor
+++ b/extra/math/extras/extras.factor
@@ -355,7 +355,7 @@ PRIVATE>
 
 :: integer-sqrt ( m -- n )
     m [ 0 ] [
-        dup 0 < [ non-negative-integer-expected ] when
+        ensure-non-negative
         bit-length 1 - 2 /i :> c
         1 :> a!
         0 :> d!