use new predicates from library(error)

This commit is contained in:
Markus Triska
2020-04-27 17:42:05 +02:00
parent 2b1692a860
commit 8e1ba58551
7 changed files with 23 additions and 33 deletions

View File

@@ -1,9 +1,11 @@
:- module(arithmetic, [msb/2, lsb/2]).
:- use_module(library(error)).
lsb(X, N) :-
builtins:must_be_number(X, lsb/2),
( \+ integer(X) -> throw(error(type_error(integer, X), lsb/2))
; X < 1 -> throw(error(domain_error(not_less_than_one, X), lsb/2))
( \+ integer(X) -> type_error(integer, X, lsb/2)
; X < 1 -> domain_error(not_less_than_one, X, lsb/2)
; builtins:can_be_number(N, lsb/2),
X1 is X /\ (-X),
msb_(X1, -1, N)
@@ -11,8 +13,8 @@ lsb(X, N) :-
msb(X, N) :-
builtins:must_be_number(X, msb/2),
( \+ integer(X) -> throw(error(type_error(integer, X), msb/2))
; X < 1 -> throw(error(domain_error(not_less_than_one, X), msb/2))
( \+ integer(X) -> type_error(integer, X, msb/2)
; X < 1 -> domain_error(not_less_than_one, X, msb/2)
; builtins:can_be_number(N, msb/2),
X1 is X >> 1,
msb_(X1, 0, N)