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

check for predicate_indicator list and sequence types in add_predicate_declaration (#1586)

Browse Source
This commit is contained in:
Mark
2023-09-26 12:54:16 -06:00
parent 39934208c3
commit 56992570d8
1 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/loader.pl
View File

@@ -379,23 +379,50 @@ remove_module(Module, Evacuable) :-
; domain_error(module_specifier, Module, use_module/2) ; domain_error(module_specifier, Module, use_module/2)
). ).
predicate_indicator(PI) :-
( var(PI) ->
throw(error(instantiation_error, _))
; PI = Name/Arity,
must_be(atom, Name),
must_be(integer, Arity),
Arity >= 0
).
predicate_indicator_sequence(PI_Seq) :-
( var(PI_Seq) ->
throw(error(instantiation_error, load/1))
; PI_Seq = (PI, PIs),
predicate_indicator(PI),
( predicate_indicator(PIs) ->
true
; predicate_indicator_sequence(PIs)
)
).
:- meta_predicate add_predicate_declaration(3, ?). :- meta_predicate add_predicate_declaration(3, ?).
add_predicate_declaration(Handler, Name/Arity) :- add_predicate_declaration(Handler, Name/Arity) :-
must_be(atom, Name), predicate_indicator(Name/Arity),
must_be(integer, Arity),
prolog_load_context(module, Module), prolog_load_context(module, Module),
call(Handler, Module, Name, Arity). call(Handler, Module, Name, Arity).
add_predicate_declaration(Handler, Module:Name/Arity) :- add_predicate_declaration(Handler, Module:Name/Arity) :-
must_be(atom, Module), must_be(atom, Module),
must_be(atom, Name), predicate_indicator(Name/Arity),
must_be(integer, Arity),
call(Handler, Module, Name, Arity). call(Handler, Module, Name, Arity).
add_predicate_declaration(Handler, [PI|PIs]) :- add_predicate_declaration(Handler, [PI|PIs]) :-
maplist(loader:add_predicate_declaration(Handler), [PI|PIs]). '$skip_max_list'(_, -1, PIs, Tail),
( Tail == [],
maplist(loader:predicate_indicator, PIs) ->
maplist(loader:add_predicate_declaration(Handler), [PI|PIs])
; throw(error(type_error(predicate_indicator_list, [PI|PIs]), load/1))
).
add_predicate_declaration(Handler, (PI, PIs)) :- add_predicate_declaration(Handler, (PI, PIs)) :-
add_predicate_declaration(Handler, PI), ( predicate_indicator_sequence((PI, PIs)) ->
add_predicate_declaration(Handler, PIs). add_predicate_declaration(Handler, PI),
add_predicate_declaration(Handler, PIs)
; throw(error(type_error(predicate_indicator_sequence, (PI, PIs)), load/1))
).
add_dynamic_predicate(Evacuable, Module, Name, Arity) :- add_dynamic_predicate(Evacuable, Module, Name, Arity) :-
'$add_dynamic_predicate'(Module, Name, Arity, Evacuable). '$add_dynamic_predicate'(Module, Name, Arity, Evacuable).