diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strengthen error handling from top-level

Browse Source
This commit is contained in:
Vitor Santos Costa 2013-02-26 09:32:39 -06:00
parent 9e250c3d0a
commit ddb14f97aa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pl/boot.yap
View File

@ -168,10 +168,7 @@ true :- true.
prompt(_,'|: '), prompt(_,'|: '),
'$system_catch'('$raw_read'(user_input, Line), prolog, E, '$system_catch'('$raw_read'(user_input, Line), prolog, E,
(print_message(error, E), (print_message(error, E),
( E = error(syntax_error(_), _) '$handle_toplevel_error'(Line, E))),
-> fail
; throw(E)
))),
( (
current_predicate(_, user:rl_add_history(_)) current_predicate(_, user:rl_add_history(_))
-> ->
@ -190,6 +187,10 @@ true :- true.
) )
), !. ), !.
'$handle_toplevel_error'(_, syntax_error(_)) :- !, fail.
'$handle_toplevel_error'(end_of_file, error(io_error(read,user_input),_)) :- !.
'$handle_toplevel_error'(_, E) :-
throw(E).
% reset alarms when entering top-level. % reset alarms when entering top-level.
'$enter_top_level' :- '$enter_top_level' :-