From a23bff9b6b1c09db23724369cd50fdf94151cd89 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Fri, 26 Apr 2002 19:15:21 +0000
Subject: [PATCH] fix wrong ! in debugger

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@457 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/tracer.c   |  4 +---
 C/unify.c    |  2 +-
 pl/debug.yap | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/C/tracer.c b/C/tracer.c
index 72c48835b..d57386090 100644
--- a/C/tracer.c
+++ b/C/tracer.c
@@ -113,11 +113,9 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
 
   vsc_count++;
   /* if (vsc_count < 3829100) return;*/
-  /*
-  if (vsc_count == 4376) {
+  if (vsc_count == 656) {
     printf("Here I go\n");
   }
-  */
   /* if (vsc_count > 500000) exit(0); */
   /* if (gc_calls < 1) return;*/
 #if defined(__GNUC__)
diff --git a/C/unify.c b/C/unify.c
index 2417e5fc3..862632f08 100644
--- a/C/unify.c
+++ b/C/unify.c
@@ -1414,7 +1414,7 @@ p_arg(void)
 	save_hb();
 	if ((Int)d0 <= 0 ||
 	    (Int)d0 > ArityOfFunctor((Functor) d1) ||
-	    IUnify((CELL)(pt0+d0), ARG3) == FALSE) {
+	    IUnify(pt0[d0], ARG3) == FALSE) {
 	  /* don't complain here for Prolog compatibility 
 	  if ((Int)d0 <= 0) {
 	    Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO,
diff --git a/pl/debug.yap b/pl/debug.yap
index 0a2ec7f34..03d0a82e1 100644
--- a/pl/debug.yap
+++ b/pl/debug.yap
@@ -21,6 +21,9 @@
 
 -----------------------------------------------------------------------------*/
 
+'$!'(CP) :-
+	'$call'(!, CP, !,Mod).
+
 :- op(900,fx,[spy,nospy]).
 
 % First part : setting and reseting spy points
@@ -103,6 +106,7 @@ debug :- '$set_value'(debug,1), write(user_error,'[ Debug mode on ]'), nl(user_e
 nodebug :- nospyall,
 	'$set_value'(debug,0),
 	'$set_value'('$trace',0),
+	'$set_yap_flags'(10,0),
 	'$format'(user_error,"[ Debug mode off ]~n",[]).
 
 trace :- '$get_value'('$trace',1), !.
@@ -358,7 +362,7 @@ debugging :-
 '$set_creep'(_).
 
 %'$spycalls'(G,_) :- write(user_error,'$spycalls'(G)), nl(user_error), fail.
-'$spycalls'('!'(CP),Mod,_) :-
+'$spycalls'('$!'(CP),Mod,_) :-
 	'$call'(!, CP, !,Mod).
 '$spycalls'(Mod:G,_,Res) :-
 	!,
@@ -713,7 +717,7 @@ debugging :-
 	'$$cut_by'(CP1),
 	'$creep_call'(Y,Module,CP).
 '$creep_call'(!,Module,CP) :- !,
-	'$direct_spy'([Module|'!'(CP)]),
+	'$direct_spy'([Module|'$!'(CP)]),
 	% clean up any garbage left here by the debugger.
 	'$$cut_by'(CP).
 '$creep_call'('$cut_by'(X),_,_) :- !,
@@ -760,7 +764,7 @@ debugging :-
 	'$creep'([M|G]).
 '$creep'(G) :- '$direct_spy'(G).
 
-'$trace'(P,'!'(_),Mod,L,NC) :- !,
+'$trace'(P,'$!'(_),Mod,L,NC) :- !,
 	'$trace'(P,!,Mod,L,NC).
 '$trace'(P,G,Mod,L,NC) :-
 	'$chk'(P,L,G,Mod,SL),
@@ -844,8 +848,7 @@ debugging :-
 '$skipeol'(_) :- get0(user,C), '$skipeol'(C).
 
 '$action'(10,call,_,_,continue) :- !,		% newline 	creep
-	'$set_yap_flags'(10,1),
-	'$creep'.
+	'$set_yap_flags'(10,1).
 '$action'(10,_,_,_,continue) :- !.		% newline 	creep
 '$action'(33,_,_,_,_) :- !,		% ! g		execute
 	read(user,G),
@@ -864,12 +867,10 @@ debugging :-
 '$action'(98,_,_,_,_) :- !, break,	% b		break
 	fail.
 '$action'(99,call,_,_,_) :- !,		% c		creep
-	'$set_yap_flags'(10,1),
-	'$creep'.
+	'$set_yap_flags'(10,1).
 '$action'(99,exit,_,_,continue) :- !.	% c		creep
 '$action'(99,fail,_,_,continue) :- !,	% c		creep
-	'$set_yap_flags'(10,1),
-	'$creep'.
+	'$set_yap_flags'(10,1).
 '$action'(101,_,_,_,_) :- !,		% e		exit
 	halt.
 '$action'(102,P,L,_,_) :- !,		% f		fail