diff --git a/core/math/integers/integers.factor b/core/math/integers/integers.factor index 81dedc66dd..27253b6da7 100644 --- a/core/math/integers/integers.factor +++ b/core/math/integers/integers.factor @@ -15,6 +15,8 @@ M: fixnum >fixnum ; inline M: fixnum >bignum fixnum>bignum ; inline M: fixnum >integer ; inline M: fixnum >float fixnum>float ; inline +M: fixnum integer>fixnum ; inline +M: fixnum integer>fixnum-strict ; inline M: fixnum hashcode* nip ; inline M: fixnum equal? over bignum? [ >bignum bignum= ] [ 2drop f ] if ; inline @@ -61,6 +63,11 @@ M: fixnum (log2) fixnum-log2 ; inline M: bignum >fixnum bignum>fixnum ; inline M: bignum >bignum ; inline +M: bignum integer>fixnum bignum>fixnum ; inline + +M: bignum integer>fixnum-strict + dup bignum>fixnum + 2dup number= [ nip ] [ drop out-of-fixnum-range ] if ; inline M: bignum hashcode* nip bignum>fixnum ; diff --git a/core/math/math.factor b/core/math/math.factor index dcedc67963..20593bd48a 100644 --- a/core/math/math.factor +++ b/core/math/math.factor @@ -7,6 +7,8 @@ GENERIC: >fixnum ( x -- n ) foldable GENERIC: >bignum ( x -- n ) foldable GENERIC: >integer ( x -- n ) foldable GENERIC: >float ( x -- y ) foldable +GENERIC: integer>fixnum ( x -- y ) foldable +GENERIC: integer>fixnum-strict ( x -- y ) foldable GENERIC: numerator ( a/b -- a ) GENERIC: denominator ( a/b -- b ) @@ -56,8 +58,6 @@ GENERIC: (log2) ( x -- n ) foldable PRIVATE> -ERROR: not-an-integer n ; - ERROR: out-of-fixnum-range n ; ERROR: log2-expects-positive x ; @@ -87,19 +87,6 @@ GENERIC: neg? ( x -- -x ) UNION: integer fixnum bignum ; -: integer>fixnum ( m -- n ) - dup fixnum? [ - dup bignum? [ bignum>fixnum ] [ not-an-integer ] if - ] unless ; inline foldable - -: integer>fixnum-strict ( m -- n ) - dup fixnum? [ - dup bignum? [ - dup bignum>fixnum 2dup number= - [ nip ] [ drop out-of-fixnum-range ] if - ] [ not-an-integer ] if - ] unless ; inline foldable - TUPLE: ratio { numerator integer read-only } { denominator integer read-only } ; UNION: rational integer ratio ;