From d413b1906cc6c1e3696d7038a262ed16de691645 Mon Sep 17 00:00:00 2001 From: vsc Date: Fri, 18 Jan 2002 16:08:30 +0000 Subject: [PATCH] smaller debugger cleanups git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@311 b08c6af1-5177-4d33-ba66-4b1c6b8b522a --- pl/corout.yap | 2 +- pl/debug.yap | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/pl/corout.yap b/pl/corout.yap index 0bdedccf4..704e9979e 100644 --- a/pl/corout.yap +++ b/pl/corout.yap @@ -620,7 +620,7 @@ call_residue(Goal,Residue) :- '$pick_vars_for_project'(LIV,NLIV), '$project_module'(LMods,NLIV,LAV), '$all_attvars'(NLAV0), - sort(NLAV0, NLAV), + '$sort'(NLAV0, NLAV), '$convert_att_vars'(NLAV, LIV, Gs, Gs0) ). diff --git a/pl/debug.yap b/pl/debug.yap index 2346783a9..0f06338be 100644 --- a/pl/debug.yap +++ b/pl/debug.yap @@ -711,13 +711,6 @@ debugging :- %'$creep'(G) :- $current_module(M),write(user_error,[creep,M,G]),nl(user_error),fail. % skip calls to assembly versions of execute. -'$creep'([_|'$execute_in_mod'(G,ModNum)]) :- !, - '$module_number'(Mod,ModNum), - '$creep'([Mod|G]). -'$creep'([M|'$execute_within'(G)]) :- !, - '$creep'([M|G]). -'$creep'([M|'$last_execute_within'(G)]) :- !, - '$creep'([M|G]). '$creep'(G) :- '$get_value'('$alarm', true), !, '$set_value'('$alarm', []), @@ -735,15 +728,13 @@ debugging :- '$handle_signals'(Signals), G=[M|Goal], '$execute'(M:Goal). -'$creep'(_) :- - '$get_value'('$throw', true), !, - '$set_value'('$throw', false), - abort. -'$creep'([_|'$trace'(P,G,Module,L)]) :- !, - '$trace'(P,G,Module,L). -'$creep'([_|'$creep_call'(G,Mod,CP)]) :- !, - '$creep_call'(G,Mod,CP). -'$creep'([_|'$leave_creep']) :- !. +'$creep'([_|'$execute_in_mod'(G,ModNum)]) :- !, + '$module_number'(Mod,ModNum), + '$creep'([Mod|G]). +'$creep'([M|'$execute_within'(G)]) :- !, + '$creep'([M|G]). +'$creep'([M|'$last_execute_within'(G)]) :- !, + '$creep'([M|G]). '$creep'(G) :- '$direct_spy'(G). '$trace'(P,'!'(_),Mod,L,NC) :- !,