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

qualify exception handling code in loader.pl (#809)

Browse Source
This commit is contained in:
Mark Thom
2021-02-09 15:47:14 -07:00
parent 9004aae597
commit 547c63b28e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/loader.pl
View File

@@ -25,7 +25,7 @@
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))) -> '$call'(loader:'$print_message_and_fail'(E, user:term_expansion/2))) ->
( var(ExpandedTerm0) -> ( var(ExpandedTerm0) ->
error:instantiation_error(term_expansion/2) error:instantiation_error(term_expansion/2)
; ExpandedTerm0 = [_|_] -> ; ExpandedTerm0 = [_|_] ->
@@ -51,7 +51,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))) -> '$call'(loader:'$print_message_and_fail'(E, Module:goal_expansion/2))) ->
( 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)
@@ -91,7 +91,8 @@ file_load(Stream, Path, Evacuable) :-
create_file_load_context(Stream, Path, Evacuable), create_file_load_context(Stream, Path, Evacuable),
catch(loader:load_loop(Stream, Evacuable), catch(loader:load_loop(Stream, Evacuable),
E, E,
(loader:unload_evacuable(Evacuable), throw(E))), builtins:(loader:unload_evacuable(Evacuable),
builtins:throw(E))),
run_initialization_goals, run_initialization_goals,
'$pop_load_context'. '$pop_load_context'.
@@ -100,7 +101,8 @@ load(Stream) :-
create_load_context(Stream, Evacuable), create_load_context(Stream, Evacuable),
catch(loader:load_loop(Stream, Evacuable), catch(loader:load_loop(Stream, Evacuable),
E, E,
(loader:unload_evacuable(Evacuable), throw(E))), builtins:(loader:unload_evacuable(Evacuable),
builtins:throw(E))),
run_initialization_goals, run_initialization_goals,
'$pop_load_context'. '$pop_load_context'.