diff --git a/extra/decimals/decimals-tests.factor b/extra/decimals/decimals-tests.factor index bb9e60cfc1..29b9d98b38 100644 --- a/extra/decimals/decimals-tests.factor +++ b/extra/decimals/decimals-tests.factor @@ -49,3 +49,4 @@ ERROR: decimal-test-failure D1 D2 quot ; [ f ] [ D: -1 D: -2 before? ] unit-test [ f ] [ D: -2 D: -2 before? ] unit-test [ t ] [ D: -3 D: -2 before? ] unit-test +[ t ] [ D: .5 D: 0 D: 1.0 between? ] unit-test diff --git a/extra/decimals/decimals.factor b/extra/decimals/decimals.factor index d9bafd43d0..ae1fb2f9a3 100644 --- a/extra/decimals/decimals.factor +++ b/extra/decimals/decimals.factor @@ -37,8 +37,7 @@ SYNTAX: D: parse-decimal parsed ; ] 2bi ; : scale-decimals ( D1 D2 -- D1' D2' ) - [ drop ] - [ scale-mantissas nip ] 2bi ; + scale-mantissas tuck [ ] 2dip ; ERROR: decimal-types-expected d1 d2 ; @@ -83,3 +82,6 @@ M: decimal before? e1 e2 a + - ; + +M: decimal <=> + 2dup before? [ 2drop +lt+ ] [ equal? +eq+ +gt+ ? ] if ; inline