Merge branch 'master' of ssh://git.code.sf.net/p/yap/yap-6.3

This commit is contained in:
Vitor Santos Costa 2013-11-05 17:13:10 +00:00
commit b2fe6099a0
3 changed files with 8 additions and 2 deletions

View File

@ -327,7 +327,7 @@ break :-
nb_getval('$debug_jump',Jump), nb_getval('$debug_jump',Jump),
nb_getval('$debug_run',Run), nb_getval('$debug_run',Run),
'$swi_current_prolog_flag'(debug, Debug), '$swi_current_prolog_flag'(debug, Debug),
'$swi_set_prolog_flag'(debug, false) '$swi_set_prolog_flag'(debug, false),
nb_getval('$break',BL), NBL is BL+1, nb_getval('$break',BL), NBL is BL+1,
nb_getval('$spy_gn',SPY_GN), nb_getval('$spy_gn',SPY_GN),
b_getval('$spy_glist',GList), b_getval('$spy_glist',GList),

View File

@ -651,7 +651,7 @@ debugging :-
read(user,G), read(user,G),
% don't allow yourself to be caught by creep. % don't allow yourself to be caught by creep.
'$swi_current_prolog_flag'(debug, OldDeb), '$swi_current_prolog_flag'(debug, OldDeb),
'$swi_set_prolog_flag'(debug, false) '$swi_set_prolog_flag'(debug, false),
( '$execute'(G) -> true ; true), ( '$execute'(G) -> true ; true),
'$swi_set_prolog_flag'(debug, OldDeb), '$swi_set_prolog_flag'(debug, OldDeb),
% '$skipeol'(0'!), % ' % '$skipeol'(0'!), % '

View File

@ -522,6 +522,8 @@ prefix(warning, '% ', user_error) -->
{ thread_self(Id) }, { thread_self(Id) },
( { Id == main } ( { Id == main }
-> [ 'Warning: ', nl ] -> [ 'Warning: ', nl ]
; { atom(Id) }
-> ['Warning: [Thread ~a ]' - Id, nl ]
; ['Warning: [Thread ~d ]' - Id, nl ] ; ['Warning: [Thread ~d ]' - Id, nl ]
). ).
prefix(error, ' ', user_error) --> prefix(error, ' ', user_error) -->
@ -529,6 +531,8 @@ prefix(error, ' ', user_error) -->
{ thread_self(Id) }, { thread_self(Id) },
( { Id == main } ( { Id == main }
-> [ 'ERROR at ' ] -> [ 'ERROR at ' ]
; { atom(Id) }
-> [ 'ERROR [Thread ~a ] at ' - Id ]
; [ 'ERROR [Thread ~d ] at ' - Id ] ; [ 'ERROR [Thread ~d ] at ' - Id ]
), ),
'$hacks':display_pc(P), '$hacks':display_pc(P),
@ -538,6 +542,8 @@ prefix(error, ' ', user_error) -->
{ thread_self(Id) }, { thread_self(Id) },
( { Id == main } ( { Id == main }
-> [ 'ERROR!!', nl ] -> [ 'ERROR!!', nl ]
; { atom(Id) }
-> [ 'ERROR!! [Thread ~a ]' - Id, nl ]
; [ 'ERROR!! [Thread ~d ]' - Id, nl ] ; [ 'ERROR!! [Thread ~d ]' - Id, nl ]
). ).
prefix(banner, '', user_error) --> []. prefix(banner, '', user_error) --> [].