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

print errors arising from term and goal expansion calls from loader.pl

Browse Source
This commit is contained in:
Mark Thom
2021-02-28 16:19:37 -07:00
parent 3f1cfd2995
commit 360485d830
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/loader.pl
View File

@@ -17,15 +17,26 @@
:- use_module(library(pairs)). :- use_module(library(pairs)).
'$print_message_and_fail'(Error, Culprit) :- '$print_message_and_fail'(Error) :-
% writeq(error(Error, Culprit)), ( Error = error(existence_error(procedure, Expansion), Expansion) ->
% nl, ( ( Expansion = goal_expansion/2
; Expansion = term_expansion/2
) ->
true
; write('caught: '),
writeq(Error),
nl
)
; write('caught: '),
writeq(Error),
nl
),
'$fail'. '$fail'.
expand_term(Term, ExpandedTerm) :- expand_term(Term, ExpandedTerm) :-
( catch('$call'(user:term_expansion(Term, ExpandedTerm0)), ( catch('$call'(user:term_expansion(Term, ExpandedTerm0)),
E, E,
'$call'(loader:'$print_message_and_fail'(E, user:term_expansion/2))) -> '$call'(loader:'$print_message_and_fail'(E))) ->
( var(ExpandedTerm0) -> ( var(ExpandedTerm0) ->
error:instantiation_error(term_expansion/2) error:instantiation_error(term_expansion/2)
; ExpandedTerm0 = [_|_] -> ; ExpandedTerm0 = [_|_] ->
@@ -51,7 +62,7 @@ term_expansion_list([Term|Terms], ExpandedTermsHead, ExpandedTermsTail) :-
goal_expansion(Goal, Module, ExpandedGoal) :- goal_expansion(Goal, Module, ExpandedGoal) :-
( catch('$call'(Module:goal_expansion(Goal, ExpandedGoal0)), ( catch('$call'(Module:goal_expansion(Goal, ExpandedGoal0)),
E, E,
'$call'(loader:'$print_message_and_fail'(E, Module:goal_expansion/2))) -> '$call'(loader:'$print_message_and_fail'(E))) ->
( var(ExpandedGoal0) -> ( var(ExpandedGoal0) ->
error:instantiation_error(goal_expansion/2) error:instantiation_error(goal_expansion/2)
; goal_expansion(ExpandedGoal0, Module, ExpandedGoal) ; goal_expansion(ExpandedGoal0, Module, ExpandedGoal)
@@ -94,6 +105,7 @@ file_load(Stream, Path, Evacuable) :-
catch(loader:load_loop(Stream, Evacuable), catch(loader:load_loop(Stream, Evacuable),
E, E,
builtins:(loader:unload_evacuable(Evacuable), builtins:(loader:unload_evacuable(Evacuable),
loader:'$print_message_and_fail'(E),
builtins:throw(E))), builtins:throw(E))),
run_initialization_goals, run_initialization_goals,
'$pop_load_context'. '$pop_load_context'.
@@ -104,6 +116,7 @@ load(Stream) :-
catch(loader:load_loop(Stream, Evacuable), catch(loader:load_loop(Stream, Evacuable),
E, E,
builtins:(loader:unload_evacuable(Evacuable), builtins:(loader:unload_evacuable(Evacuable),
loader:'$print_message_and_fail'(E),
builtins:throw(E))), builtins:throw(E))),
run_initialization_goals, run_initialization_goals,
'$pop_load_context', '$pop_load_context',
@@ -523,7 +536,7 @@ load_context(Module) :-
predicate_property(Callable, Property) :- predicate_property(Callable, Property) :-
( var(Callable) -> ( var(Callable) ->
instantiation_error(load/1) instantiation_error(predicate_property/2)
; functor(Callable, (:), 2), ; functor(Callable, (:), 2),
arg(1, Callable, Module), arg(1, Callable, Module),
arg(2, Callable, Callable0), arg(2, Callable, Callable0),