rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use new predicates from library(error)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/prolog/lib/arithmetic.pl
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)

8
src/prolog/lib/clpb.pl
View File

@@ -34,7 +34,7 @@
:- use_module(library(random)).
:- use_module(library(pairs)).
:- use_module(library(dcgs)).
:- use_module(library(error), []).
:- use_module(library(error), [domain_error/3, type_error/3]).
:- attribute
clpb/1,
@@ -98,16 +98,10 @@ instantiation_error(_, Goal-Arg) :-
domain_error(Expectation, Term) :-
domain_error(Expectation, Term, unknown(Term)-1).
domain_error(Expectation, Term, Goal-Arg) :-
throw(error(domain_error(Expectation, Term), domain_error(Goal, Arg, Expectation, Term))).
type_error(Expectation, Term) :-
type_error(Expectation, Term, unknown(Term)-1).
type_error(Expectation, Term, Goal-Arg) :-
throw(error(type_error(Expectation, Term), type_error(Goal, Arg, Expectation, Term))).
partition(Pred, Ls0, As, Bs) :-
include(Pred, Ls0, As),
exclude(Pred, Ls0, Bs).

9
src/prolog/lib/clpz.pl
View File

@@ -115,7 +115,7 @@
:- use_module(library(iso_ext)).
:- use_module(library(dcgs)).
:- use_module(library(terms)).
:- use_module(library(error), []).
:- use_module(library(error), [domain_error/3, type_error/3]).
:- use_module(library(si)).
:- use_module(library(freeze)).
@@ -185,16 +185,9 @@ instantiation_error(_, Goal-Arg) :-
domain_error(Expectation, Term) :-
domain_error(Expectation, Term, unknown(Term)-1).
domain_error(Expectation, Term, Goal-Arg) :-
throw(error(domain_error(Expectation, Term), domain_error(Goal, Arg, Expectation, Term))).
type_error(Expectation, Term) :-
type_error(Expectation, Term, unknown(Term)-1).
type_error(Expectation, Term, Goal-Arg) :-
throw(error(type_error(Expectation, Term), type_error(Goal, Arg, Expectation, Term))).
partition(Pred, Ls0, As, Bs) :-
include(Pred, Ls0, As),

9
src/prolog/lib/format.pl
View File

@@ -148,7 +148,7 @@ element_gluevar(glue(_,V), N, N) --> [V].
cells([], Args, Tab, Es) -->
( { Args == [] } -> cell(Tab, Tab, Es)
; { domain_error(no_remaining_arguments, Args) }
; { domain_error(no_remaining_arguments, Args, format_//2) }
).
cells([~,~|Fs], Args, Tab, Es) --> !,
cells(Fs, Args, Tab, [chars("~")|Es]).
@@ -253,15 +253,12 @@ cells([~|Fs0], Args0, Tab0, Es) -->
cells(Fs, Args, Tab, []).
cells([~,C|_], _, _, _) -->
{ atom_chars(A, [~,C]),
domain_error(format_string, A) }.
domain_error(format_string, A, format_//2) }.
cells(Fs0, Args, Tab, Es) -->
{ phrase(upto_what(Fs1, ~), Fs0, Fs),
Fs1 = [_|_] },
cells(Fs, Args, Tab, [chars(Fs1)|Es]).
domain_error(Type, Term) :-
throw(error(domain_error(Type, Term), _)).
n_newlines(0) --> !.
n_newlines(1) --> !, [newline].
n_newlines(N0) --> { N0 > 1, N is N0 - 1 }, [newline], n_newlines(N).
@@ -498,7 +495,7 @@ listing(PI) :-
Arity = Arity0
; PI = Name//Arity0 ->
Arity is Arity0 + 2
; throw(error(type_error(predicate_indicator, PI), listing/1))
; type_error(predicate_indicator, PI, listing/1)
),
functor(Head, Name, Arity),
\+ \+ clause(Head, Body), % only true if there is at least one clause

5
src/prolog/lib/pio.pl
View File

@@ -1,11 +1,12 @@
:- module(pio, [phrase_from_file/2]).
:- use_module(library(dcgs)).
:- use_module(library(error)).
phrase_from_file(NT, File) :-
( var(File) -> throw(error(instantiation_error, phrase_from_file/2))
( var(File) -> instantiation_error(phrase_from_file/2)
; (\+ atom(File) ; File = []) ->
throw(error(domain_error(source_sink, File), phrase_from_file/2))
domain_error(source_sink, File, phrase_from_file/2)
; '$file_to_chars'(File, Chars),
phrase(NT, Chars)
).

12
src/prolog/lib/random.pl
View File

@@ -6,6 +6,8 @@
the random seed. This makes everything completely reproducible.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */
:- use_module(library(error)).
% succeeds with probability 0.5.
maybe :- '$maybe'.
@@ -22,9 +24,9 @@ random_integer(Lower, Upper, R) :-
( (var(Lower) ; var(Upper)) ->
throw(error(instantiation_error, random_integer/3))
; \+ integer(Lower) ->
throw(error(domain_error(integer, Lower), random_integer/3))
domain_error(integer, Lower, random_integer/3)
; \+ integer(Upper) ->
throw(error(domain_error(integer, Upper), random_integer/3))
domain_error(integer, Upper, random_integer/3)
; Upper > Lower,
random(R0),
R is floor((Upper - Lower) * R0 + Lower)
@@ -47,11 +49,11 @@ rnd_(N, R0, R) :-
set_random(Seed) :-
( nonvar(Seed) ->
( Seed = seed(S) ->
( var(S) -> throw(error(instantiation_error, set_random/1))
( var(S) -> instantiation_error(set_random/1)
; integer(S) -> '$set_seed'(S)
; throw(error(type_error(integer(S), set_random/1)))
; type_error(integer, S, set_random/1)
)
)
; throw(error(instantiation_error, set_random/1))
; instantiation_error(set_random/1)
).

3
src/prolog/lib/time.pl
View File

@@ -13,13 +13,14 @@
:- use_module(library(format)).
:- use_module(library(iso_ext)).
:- use_module(library(error)).
max_sleep_time(0xfffffffffffffbff).
sleep(T) :-
builtins:must_be_number(T, sleep),
( T < 0 ->
throw(error(domain_error(not_less_than_zero, T), sleep/1))
domain_error(not_less_than_zero, T, sleep/1)
; max_sleep_time(N), T > N ->
throw(error(reprensentation_error(max_sleep_time), sleep/1))
; '$sleep'(T)