From 3e4e75dbdf4c9f549b05759bcb5f84cb81f05036 Mon Sep 17 00:00:00 2001
From: vsc <vsc@b08c6af1-5177-4d33-ba66-4b1c6b8b522a>
Date: Mon, 15 Oct 2007 23:48:46 +0000
Subject: [PATCH] unset var

git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1955 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
---
 C/c_interface.c  | 13 ++++++++++---
 changes-5.1.html |  2 ++
 docs/yap.tex     |  3 ++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/C/c_interface.c b/C/c_interface.c
index 6321259b2..89adf9390 100644
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -10,8 +10,11 @@
 * File:		c_interface.c						 *
 * comments:	c_interface primitives definition 			 *
 *									 *
-* Last rev:	$Date: 2007-10-05 18:24:30 $,$Author: vsc $						 *
+* Last rev:	$Date: 2007-10-15 23:48:46 $,$Author: vsc $						 *
 * $Log: not supported by cvs2svn $
+* Revision 1.97  2007/10/05 18:24:30  vsc
+* fix garbage collector and fix LeaveGoal
+*
 * Revision 1.96  2007/09/04 10:34:54  vsc
 * Improve SWI interface emulation.
 *
@@ -1220,6 +1223,7 @@ YAP_EnterGoal(PredEntry *pe, Term *ptr, YAP_dogoalinfo *dgi)
 {
   UInt i;
   choiceptr myB;
+  int out;
 
   BACKUP_MACHINE_REGS();
   dgi->p = P;
@@ -1249,9 +1253,12 @@ YAP_EnterGoal(PredEntry *pe, Term *ptr, YAP_dogoalinfo *dgi)
 #if defined(YAPOR) || defined(THREADS)
   WPP = NULL;
 #endif
-  YENV[E_CB] = Unsigned (B);
   ASP = YENV = (CELL *)B;
-  return run_emulator(dgi);
+  YENV[E_CB] = Unsigned (B);
+  fprintf(stderr,"%p--%p\n",B,myB);
+  out = run_emulator(dgi);
+  RECOVER_MACHINE_REGS();
+  return out;
 }
 
 X_API int
diff --git a/changes-5.1.html b/changes-5.1.html
index 253f1442f..9adedec8b 100644
--- a/changes-5.1.html
+++ b/changes-5.1.html
@@ -17,6 +17,8 @@
 
 <h2>Yap-5.1.3:</h2>
 <ul>
+<li> FIXED: YAP_EnterGoal would set YENV[E_CB] before setting YENV
+  (obs from Trevor Walker).</li>
 <li> FIXED: setarg/3 should always set a global variable.</li>
 <li> NEW: define dialect and version_data flags.</li>
 <li> NEW: define __YAP_PROLOG__.</li>
diff --git a/docs/yap.tex b/docs/yap.tex
index e04c6241f..6da53d26b 100644
--- a/docs/yap.tex
+++ b/docs/yap.tex
@@ -13843,7 +13843,8 @@ be be found.
 @findex YAP_LeaveGoal/2
 Exit a query query created by @code{YAP_EnterGoal}. If
 @code{backtrack} is @code{TRUE}, variable bindings are undone and Heap
-space is recovered.  Otherwise, stack space is recovered.
+space is recovered.  Otherwise, only stack space is recovered, ie,
+@code{LeaveGoal} executes a cut.
 
 Next, follows an example of how to use @code{YAP_EnterGoal}:
 @example