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

reorder declaration matching in loader.pl

Browse Source
This commit is contained in:
Mark Thom
2021-03-22 18:13:01 -06:00
parent fffb87d013
commit 9f861dfe89
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/loader.pl
View File

@@ -330,39 +330,39 @@ 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(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(dynamic(Module:Name/Arity), Evacuable) :- compile_declaration(dynamic(Module:Name/Arity), Evacuable) :-
!,
must_be(atom, Module), must_be(atom, Module),
must_be(atom, Name), must_be(atom, Name),
must_be(integer, Arity), must_be(integer, Arity),
'$add_dynamic_predicate'(Module, Name, Arity, Evacuable). '$add_dynamic_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(multifile(Name/Arity), Evacuable) :- compile_declaration(dynamic(Name/Arity), Evacuable) :-
!,
must_be(atom, Name), must_be(atom, Name),
must_be(integer, Arity), must_be(integer, Arity),
prolog_load_context(module, Module), prolog_load_context(module, Module),
'$add_multifile_predicate'(Module, Name, Arity, Evacuable). '$add_dynamic_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(multifile(Module:Name/Arity), Evacuable) :- compile_declaration(multifile(Module:Name/Arity), Evacuable) :-
!,
must_be(atom, Module), must_be(atom, Module),
must_be(atom, Name), must_be(atom, Name),
must_be(integer, Arity), must_be(integer, Arity),
'$add_multifile_predicate'(Module, Name, Arity, Evacuable). '$add_multifile_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(discontiguous(Name/Arity), Evacuable) :- compile_declaration(multifile(Name/Arity), Evacuable) :-
!,
must_be(atom, Name), must_be(atom, Name),
must_be(integer, Arity), must_be(integer, Arity),
prolog_load_context(module, Module), prolog_load_context(module, Module),
'$add_discontiguous_predicate'(Module, Name, Arity, Evacuable). '$add_multifile_predicate'(Module, Name, Arity, Evacuable).
compile_declaration(discontiguous(Module:Name/Arity), Evacuable) :- compile_declaration(discontiguous(Module:Name/Arity), Evacuable) :-
!,
must_be(atom, Module), must_be(atom, Module),
must_be(atom, Name), must_be(atom, Name),
must_be(integer, Arity), must_be(integer, Arity),
'$add_discontiguous_predicate'(Module, Name, Arity, Evacuable). '$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),
'$add_dynamic_predicate'(Module, '$initialization_goals', 1, Evacuable), '$add_dynamic_predicate'(Module, '$initialization_goals', 1, Evacuable),