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

generalize multifile/dynamic/discontiguous declarations over lists of predicate indicators (#1586)

Browse Source
This commit is contained in:
Mark
2023-09-21 16:22:41 -06:00
parent b3239abea1
commit c26e9436b4
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/loader.pl
View File

@@ -379,6 +379,29 @@ remove_module(Module, Evacuable) :-
; domain_error(module_specifier, Module, use_module/2) ; domain_error(module_specifier, Module, use_module/2)
). ).
:- meta_predicate add_predicate_declaration(3, ?).
add_predicate_declaration(Handler, Name/Arity) :-
must_be(atom, Name),
must_be(integer, Arity),
prolog_load_context(module, Module),
call(Handler, Module, Name, Arity).
add_predicate_declaration(Handler, Module:Name/Arity) :-
must_be(atom, Module),
must_be(atom, Name),
must_be(integer, Arity),
call(Handler, Module, Name, Arity).
add_predicate_declaration(Handler, [PI|PIs]) :-
maplist(loader:add_predicate_declaration(Handler), [PI|PIs]).
add_dynamic_predicate(Evacuable, Module, Name, Arity) :-
'$add_dynamic_predicate'(Module, Name, Arity, Evacuable).
add_multifile_predicate(Evacuable, Module, Name, Arity) :-
'$add_multifile_predicate'(Module, Name, Arity, Evacuable).
add_discontiguous_predicate(Evacuable, Module, Name, Arity) :-
'$add_discontiguous_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(use_module(Module), Evacuable) :- compile_declaration(use_module(Module), Evacuable) :-
use_module(Module, [], Evacuable). use_module(Module, [], Evacuable).
@@ -392,39 +415,12 @@ compile_declaration(module(Module, Exports), Evacuable) :-
'$declare_module'(Module, Exports, Evacuable) '$declare_module'(Module, Exports, Evacuable)
; type_error(atom, Module, load/1) ; type_error(atom, Module, load/1)
). ).
compile_declaration(dynamic(Module:Name/Arity), Evacuable) :- compile_declaration(dynamic(PIs), Evacuable) :-
!, add_predicate_declaration(loader:add_dynamic_predicate(Evacuable), PIs).
must_be(atom, Module), compile_declaration(multifile(PIs), Evacuable) :-
must_be(atom, Name), add_predicate_declaration(loader:add_multifile_predicate(Evacuable), PIs).
must_be(integer, Arity), compile_declaration(discontiguous(PIs), Evacuable) :-
'$add_dynamic_predicate'(Module, Name, Arity, Evacuable). add_predicate_declaration(loader:add_discontiguous_predicate(Evacuable), PIs).
compile_declaration(dynamic(Name/Arity), Evacuable) :-
must_be(atom, Name),
must_be(integer, Arity),
prolog_load_context(module, Module),
'$add_dynamic_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(multifile(Module:Name/Arity), Evacuable) :-
!,
must_be(atom, Module),
must_be(atom, Name),
must_be(integer, Arity),
'$add_multifile_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(multifile(Name/Arity), Evacuable) :-
must_be(atom, Name),
must_be(integer, Arity),
prolog_load_context(module, Module),
'$add_multifile_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(discontiguous(Module:Name/Arity), Evacuable) :-
!,
must_be(atom, Module),
must_be(atom, Name),
must_be(integer, Arity),
'$add_discontiguous_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(discontiguous(Name/Arity), Evacuable) :-
must_be(atom, Name),
must_be(integer, Arity),
prolog_load_context(module, Module),
'$add_discontiguous_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(initialization(Goal), Evacuable) :- compile_declaration(initialization(Goal), Evacuable) :-
prolog_load_context(module, Module), prolog_load_context(module, Module),
assertz(Module:'$initialization_goals'(Goal)). assertz(Module:'$initialization_goals'(Goal)).