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

catch exceptions thrown from initialization goals (#852)

Browse Source
This commit is contained in:
Mark Thom
2021-03-03 13:56:13 -07:00
parent 5a3ee3a46e
commit d3612e956e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/loader.pl
View File

@@ -105,23 +105,23 @@ file_load(_, _).
file_load(Stream, Path, Evacuable) :- 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),
loader:run_initialization_goals),
E, E,
builtins:(loader:unload_evacuable(Evacuable), builtins:(loader:unload_evacuable(Evacuable),
loader:'$print_message_and_fail'(E), loader:'$print_message_and_fail'(E),
builtins:throw(E))), builtins:throw(E))),
run_initialization_goals,
'$pop_load_context'. '$pop_load_context'.
load(Stream) :- load(Stream) :-
create_load_context(Stream, Evacuable), create_load_context(Stream, Evacuable),
catch(loader:load_loop(Stream, Evacuable), catch((loader:load_loop(Stream, Evacuable),
loader:run_initialization_goals),
E, E,
builtins:(loader:unload_evacuable(Evacuable), builtins:(loader:unload_evacuable(Evacuable),
loader:'$print_message_and_fail'(E), loader:'$print_message_and_fail'(E),
builtins:throw(E))), builtins:throw(E))),
run_initialization_goals,
'$pop_load_context', '$pop_load_context',
false. %% Clear the heap. false. %% Clear the heap.
load(_). load(_).