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

fix SetAttVar: things may have changed since we asked to bind a variable.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@774 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2003-02-14 10:52:00 +00:00
parent 5f92a9550e
commit e7f92398da
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
C/attvar.c
View File

@ -278,9 +278,8 @@ PutAtt(attvar_record *attv, Int i, Term tatt) {
} }
#else #else
CELL *timestmp = (CELL *)(attv->Atts[pos]); CELL *timestmp = (CELL *)(attv->Atts[pos]);
if (B->cp_h <= timestmp) if (B->cp_h <= timestmp) {
{ attv->Atts[pos+1] = tatt;
attv->Atts[pos+1] = tatt;
} else { } else {
Term tnewt; Term tnewt;
MaBind(attv->Atts+pos+1, tatt); MaBind(attv->Atts+pos+1, tatt);
@ -315,7 +314,6 @@ RmAtt(attvar_record *attv, Int i) {
tnewt = CurrentTime(); tnewt = CurrentTime();
MaBind(attv->Atts+pos, tnewt); MaBind(attv->Atts+pos, tnewt);
} }
}
#else #else
CELL *timestmp = (CELL *)(attv->Atts[pos]); CELL *timestmp = (CELL *)(attv->Atts[pos]);
if (B->cp_h <= timestmp) { if (B->cp_h <= timestmp) {
@ -332,8 +330,8 @@ RmAtt(attvar_record *attv, Int i) {
*H++ = TermFoundVar; *H++ = TermFoundVar;
MaBind(attv->Atts+pos, tnewt); MaBind(attv->Atts+pos, tnewt);
} }
}
#endif #endif
}
return(TRUE); return(TRUE);
} }
@ -405,7 +403,27 @@ FreeAtt(attvar_record *attv, int i) {
static Int static Int
BindAttVar(attvar_record *attv) { BindAttVar(attvar_record *attv) {
if (IsVarTerm(attv->Done) && IsUnboundVar(attv->Done)) { if (IsVarTerm(attv->Done) && IsUnboundVar(attv->Done)) {
Bind_Global(&(attv->Done), attv->Value); /* make sure we are not trying to bind a variable against itself */
if (!IsVarTerm(attv->Value)) {
Bind_Global(&(attv->Done), attv->Value);
} else if (IsVarTerm(attv->Value)) {
Term t = Deref(attv->Value);
if (IsVarTerm(t)) {
if (IsAttachedTerm(t)) {
attvar_record *attv2 = (attvar_record *)VarOfTerm(t);
if (attv2 < attv) {
Bind_Global(&(attv->Done), t);
} else {
Bind_Global(&(attv2->Done), (CELL)attv);
}
} else {
Yap_Error(SYSTEM_ERROR,(CELL)&(attv->Done),"attvar was bound when unset");
return(FALSE);
}
} else {
Bind_Global(&(attv->Done), t);
}
}
return(TRUE); return(TRUE);
} else { } else {
Yap_Error(SYSTEM_ERROR,(CELL)&(attv->Done),"attvar was bound when set"); Yap_Error(SYSTEM_ERROR,(CELL)&(attv->Done),"attvar was bound when set");