diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes for copy_term

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1041 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2004-04-19 17:06:51 +00:00
parent 572690acd8
commit ea52ce8b26
3 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
C/utilpreds.c
View File

@@ -59,8 +59,8 @@ copy_complex_term(register CELL *pt0, register CELL *pt0_end, CELL *ptf, CELL *H
{
CELL **to_visit0, **to_visit = (CELL **)Yap_PreAllocCodeSpace();
tr_fr_ptr TR0 = TR;
CELL *HB0 = HB;
tr_fr_ptr TR0 = TR;
#ifdef COROUTINING
CELL *dvars = NULL;
#endif
@@ -185,41 +185,20 @@ copy_complex_term(register CELL *pt0, register CELL *pt0_end, CELL *ptf, CELL *H
if (IsAttachedTerm((CELL)ptd0)) {
/* if unbound, call the standard copy term routine */
CELL **bp[1];
tr_fr_ptr CurTR;
if (dvars == NULL) {
dvars = (CELL *)Yap_ReadTimedVar(DelayedVars);
}
if (ptd0 >= dvars) {
*ptf++ = (CELL) ptd0;
} else {
if (dvars == NULL) {
dvars = (CELL *)Yap_ReadTimedVar(DelayedVars);
}
bp[0] = to_visit;
CurTR = TR;
HB = HB0;
if (!attas[ExtFromCell(ptd0)].copy_term_op(ptd0, bp, ptf)) {
goto overflow;
}
to_visit = bp[0];
HB = HLow;
if (CurTR != TR) {
/* Problem here is that the attached routine might
* have changed the list of suspended goals and stored
* new entries in the trail. This should be quite
* rare, so for simplicity we just swap cells from
* bottom and top of Trail, not nice but not worth
* complicating everything else.
*/
CELL *pt1 = (CELL *)TR0;
CELL *pt2 = (CELL *)CurTR;
while (pt2 < (CELL *)TR) {
CELL o = *pt1;
pt1++;
pt2++;
pt1[-1] = pt2[-1];
pt2[-1] = o;
}
TR0 = (tr_fr_ptr)pt1;
}
ptf++;
Bind_Global(ptd0, ptf[-1]);
}