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

fix arrays of generic terms.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@422 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc
2002-03-27 20:53:58 +00:00
parent a4c275daf2
commit 6f051a5025
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
C/arrays.c
View File

@@ -756,23 +756,32 @@ p_create_static_array(void)
/* Create a named array */
AtomEntry *ae = RepAtom(AtomOfTerm(t));
StaticArrayEntry *pp;
ArrayEntry *app = (ArrayEntry *) pp;
WRITE_LOCK(ae->ARWLock);
pp = RepStaticArrayProp(ae->PropsOfAE);
while (!EndOfPAEntr(pp) && pp->KindOfPE != ArrayProperty)
pp = RepStaticArrayProp(pp->NextOfPE);
app = (ArrayEntry *) pp;
if (EndOfPAEntr(pp) || pp->ValueOfVE.ints == NULL) {
CreateStaticArray(ae, size, props, NULL, pp);
return (TRUE);
} else if (ArrayIsDynamic(app)) {
if (IsVarTerm(app->ValueOfVE) && IsUnboundVar(app->ValueOfVE)) {
CreateStaticArray(ae, size, props, NULL, pp);
return (TRUE);
} else {
Error(PERMISSION_ERROR_CREATE_ARRAY,t,"cannot create static array over dynamic array");
return (FALSE);
}
} else {
WRITE_UNLOCK(ae->ARWLock);
Error(PERMISSION_ERROR_CREATE_ARRAY,t,"create static array");
return(FALSE);
Error(PERMISSION_ERROR_CREATE_ARRAY,t,"cannot create static array over static array");
return (FALSE);
}
} else {
Error(TYPE_ERROR_ATOM,t,"create static array");
return (FALSE);
}
Error(TYPE_ERROR_ATOM,t,"create static array");
return (FALSE);
}
/* has a static array associated (+Name) */
@@ -1399,6 +1408,7 @@ p_assign_static(void)
if (indx < 0 || indx >= - ptr->ArrayEArity) {
WRITE_UNLOCK(ptr->ArRWLock);
Error(DOMAIN_ERROR_ARRAY_OVERFLOW,t2,"assign_static");
return(FALSE);
}
switch (ptr->ArrayType) {
case array_of_ints:
@@ -1534,7 +1544,7 @@ p_assign_static(void)
ReleaseTermFromDB(ref);
}
ptr->ValueOfVE.terms[indx] = StoreTermInDB(3,3);
if (ptr->ValueOfVE.terms[indx]){
if (ptr->ValueOfVE.terms[indx] == NULL){
WRITE_UNLOCK(ptr->ArRWLock);
return(FALSE);
}