From 7be5341ee0bdd5028778cf7566ad4cc413cae196 Mon Sep 17 00:00:00 2001 From: vsc Date: Tue, 5 Nov 2002 19:14:42 +0000 Subject: [PATCH] don't show inner preds in stack dump. debugger should never show (a,b). git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@673 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- pl/debug.yap | 8 ++++++-- pl/errors.yap | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pl/debug.yap b/pl/debug.yap index 90a184d15..e77fc8386 100644 --- a/pl/debug.yap +++ b/pl/debug.yap @@ -273,7 +273,6 @@ debugging :- % '$format'(user_error,"$spym(~w,~w)~n",[Module,G]), '$is_push_pred_mod'(G,Module), !, - /* called from prolog module */ '$creep', '$execute0'(G,Module). '$spy'([Mod|G]) :- @@ -290,7 +289,7 @@ debugging :- '$creep', '$wake_up_goal'(G, LG). '$direct_spy'([M|G]) :- - '$hidden'(G), + '$hidden_predicate'(G,M), !, ( G = '$leave_creep' @@ -301,6 +300,11 @@ debugging :- '$execute0'(G,M), '$creep' ). +'$direct_spy'([M|G]) :- + '$is_push_pred_mod'(G,M), + !, + '$creep', + '$execute0'(G,M). '$direct_spy'([Mod|G]) :- '$do_spy'(G, Mod). diff --git a/pl/errors.yap b/pl/errors.yap index 59c3745f7..9be336fb5 100644 --- a/pl/errors.yap +++ b/pl/errors.yap @@ -167,6 +167,10 @@ print_message(Level, Mss) :- % The user should never know these exist. '$beautify_hidden_goal'('$csult',_,prolog,ClNo,Gs,NGs) :- !, '$preprocess_stack'(Gs, NGs). +'$beautify_hidden_goal'('$use_module',2,prolog,ClNo,Gs,NGs) :- !, + '$preprocess_stack'(Gs, NGs). +'$beautify_hidden_goal'('$ensure_loaded',_,prolog,ClNo,Gs,NGs) :- !, + '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$recordedp',_,prolog,ClNo,Gs,NGs) :- !, '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$continue_with_command',_,prolog,ClNo,Gs,NGs) :- !, @@ -199,10 +203,12 @@ print_message(Level, Mss) :- '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$consult',1,prolog,ClNo,Gs,NGs) :- !, '$preprocess_stack'(Gs, NGs). -'$beautify_hidden_goal'('$reconsult',1,prolog,ClNo,Gs,NGs) :- !, +'$beautify_hidden_goal'('$reconsult',_,prolog,ClNo,Gs,NGs) :- !, '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$undefp',1,prolog,ClNo,Gs,NGs) :- !, '$preprocess_stack'(Gs, NGs). +'$beautify_hidden_goal'('$use_module',2,prolog,ClNo,Gs,NGs) :- !, + '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$repeat',0,prolog,ClNo,Gs,[cl(repeat,0,prolog,ClNo)|NGs]) :- !, '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$recorded_with_key',3,prolog,ClNo,Gs,[cl(recorded,3,prolog,ClNo)|NGs]) :- !, @@ -223,6 +229,8 @@ print_message(Level, Mss) :- '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'('$list_clauses',_,prolog,ClNo,Gs,[cl(listing,1,prolog,ClNo)|NGs]) :- !, '$preprocess_stack'(Gs, NGs). +'$beautify_hidden_goal'('$use_module',1,prolog,ClNo,Gs,[cl(use_module,1,prolog,ClNo)|NGs]) :- !, + '$preprocess_stack'(Gs, NGs). '$beautify_hidden_goal'(Name,Args,Mod,ClNo,Gs,[cl(Name,Args,Mod,ClNo)|NGs]) :- '$preprocess_stack'(Gs, NGs).