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

Fix bad handling for error(x,y) or error(X,Y) (report from Paulo Moura).

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@739 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-01-10 11:52:33 +00:00
parent 5a0c5b8ce1
commit f46ffa6f17
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pl/errors.yap
View File

@ -48,8 +48,12 @@ print_message(Level, Mss) :-
'$print_message'(force(_Severity), Msg) :- !, '$print_message'(force(_Severity), Msg) :- !,
print(user_error,Msg). print(user_error,Msg).
'$print_message'(Severity, Msg) :- '$print_message'(Severity, Msg) :-
nonvar(Severity), nonvar(Msg),
\+ '$undefined'(portray_message(Severity, Msg), user), \+ '$undefined'(portray_message(Severity, Msg), user),
user:portray_message(Severity, Msg), !. user:portray_message(Severity, Msg), !.
'$print_message'(error,error(Msg,Info)) :-
( var(Msg) ; var(Info) ), !,
'$format'(user_error,"[ No handler for error ~w ]~n", [error(Msg,Info)]).
'$print_message'(error,error(syntax_error(A,B,C,D,E,F),_)) :- !, '$print_message'(error,error(syntax_error(A,B,C,D,E,F),_)) :- !,
'$output_error_message'(syntax_error(A,B,C,D,E,F), 'SYNTAX ERROR'). '$output_error_message'(syntax_error(A,B,C,D,E,F), 'SYNTAX ERROR').
'$print_message'(error,error(Msg,[Info|local_sp(Where,Envs,CPs)])) :- !, '$print_message'(error,error(Msg,[Info|local_sp(Where,Envs,CPs)])) :- !,
@ -57,8 +61,8 @@ print_message(Level, Mss) :-
'$output_error_message'(Msg, Location), !, '$output_error_message'(Msg, Location), !,
'$do_stack_dump'(Envs, CPs). '$do_stack_dump'(Envs, CPs).
% old format: don't want a stack dump. % old format: don't want a stack dump.
'$print_message'(error,error(Type,Where)) :- !, '$print_message'(error,error(Type,Where)) :-
'$output_error_message'(Type, Where). '$output_error_message'(Type, Where), !.
'$print_message'(error,Throw) :- '$print_message'(error,Throw) :-
'$format'(user_error,"[ No handler for error ~w ]~n", [Throw]). '$format'(user_error,"[ No handler for error ~w ]~n", [Throw]).
'$print_message'(informational,M) :- '$print_message'(informational,M) :-