From b2934a5aeb1247e1e1513dd130ea18b6719b9724 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Fri, 16 Nov 2001 20:27:06 +0000
Subject: [PATCH] fix abolish/1

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@182 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/cdmgr.c          |  2 +-
 C/tracer.c         |  4 ++--
 OPTYap/tab.insts.i | 11 +++++++++--
 changes4.3.html    |  2 ++
 pl/preds.yap       |  5 +++--
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/C/cdmgr.c b/C/cdmgr.c
index 10fa71943..c5682c9b9 100644
--- a/C/cdmgr.c
+++ b/C/cdmgr.c
@@ -2134,7 +2134,7 @@ InitCdMgr(void)
   InitCPred("$optimizer_on", 0, p_optimizer_on, SafePredFlag|SyncPredFlag);
   InitCPred("$clean_up_dead_clauses", 0, p_clean_up_dead_clauses, SyncPredFlag);
   InitCPred("$optimizer_off", 0, p_optimizer_off, SafePredFlag|SyncPredFlag);
-  InitCPred("$kill_dynamic", 1, p_kill_dynamic, SafePredFlag|SyncPredFlag);
+  InitCPred("$kill_dynamic", 2, p_kill_dynamic, SafePredFlag|SyncPredFlag);
   InitCPred("$in_this_file_before", 3, p_in_this_f_before, SafePredFlag);
   InitCPred("$first_clause_in_file", 3, p_first_cl_in_f, SafePredFlag);
   InitCPred("$mk_cl_not_first", 2, p_mk_cl_not_first, SafePredFlag);
diff --git a/C/tracer.c b/C/tracer.c
index 6d3b65f4a..3f440a212 100644
--- a/C/tracer.c
+++ b/C/tracer.c
@@ -130,10 +130,10 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
   extern int gc_calls;
 
   vsc_count++;
-  /*  if (vsc_count < 24) return; */
+  /* if (vsc_count <178000) return; */
   /* if (vsc_count > 500000) exit(0); */
   /* if (gc_calls < 1) return;*/
-  YP_fprintf(YP_stderr,"%lu (%d)", vsc_count, CurrentModule);
+  YP_fprintf(YP_stderr,"%lu ", vsc_count);
   /* check_trail_consistency(); */
   if (pred == NULL) {
     return;
diff --git a/OPTYap/tab.insts.i b/OPTYap/tab.insts.i
index 275e1e47e..71d8f6040 100644
--- a/OPTYap/tab.insts.i
+++ b/OPTYap/tab.insts.i
@@ -153,13 +153,20 @@
           GONext();                                     \
         }
 
-
+#ifdef DEPTH_LIMIT
+#define allocate_environment(PTR)  \
+        PTR[E_CP] = (CELL) CPREG;  \
+        PTR[E_E] = (CELL) ENV;     \
+        PTR[E_DEPTH] = (CELL)DEPTH;\
+        PTR[E_B] = (CELL) B;       \
+        ENV = PTR
+#else
 #define allocate_environment(PTR)  \
         PTR[E_CP] = (CELL) CPREG;  \
         PTR[E_E] = (CELL) ENV;     \
         PTR[E_B] = (CELL) B;       \
         ENV = PTR
-
+#endif
 
 
 /* ------------------------------ **
diff --git a/changes4.3.html b/changes4.3.html
index 7e88da19b..46ba59a8d 100644
--- a/changes4.3.html
+++ b/changes4.3.html
@@ -16,6 +16,8 @@
 
 <h2>Yap-4.3.20:</h2>
 <ul>
+	<li>FIXED: abolish/1.</li>
+	<li>NEW: try to make module system really compatible.</li>
 	<li>CLEANUP: don't use state of Pred.</li>
 	<li>SPEEDUP: improve predicate access by linking predicates to
 	functors.</li>
diff --git a/pl/preds.yap b/pl/preds.yap
index 72eba32d5..7aeab871e 100644
--- a/pl/preds.yap
+++ b/pl/preds.yap
@@ -359,14 +359,15 @@ abolish(N,A) :-
 	( '$recorded'('$predicate_defs','$predicate_defs'(N,A,_),R) -> erase(R) ),
 	fail.
 '$abolish'(N,A,M) :- functor(T,N,A),
-		( '$is_dynamic'(T) -> '$abolishd'(T,M) ;
+		( '$is_dynamic'(T, M) -> '$abolishd'(T,M) ;
 	      	 /* else */	      '$abolishs'(T,M) ).
 
 abolish(X) :- 
 	'$access_yap_flags'(8, 2), !,
 	'$current_module'(M),
 	'$new_abolish'(X,M).
-abolish(X,M) :- 
+abolish(X) :- 
+	'$current_module'(M),
 	'$old_abolish'(X,M).
 
 '$new_abolish'(V,M) :- var(V,N), !,