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

6
docs/yap.tex
View File

@ -3353,9 +3353,9 @@ reset the stream and is used for @code{tty} type files, and @code{eof_code},
which generates a new @code{end-of-file} (default for non-tty files). which generates a new @code{end-of-file} (default for non-tty files).
@item alias(+@var{Name}) @item alias(+@var{Name})
Specify an alias to the file. The alias @t{Name} must be an atom. The Specify an alias to the stream. The alias @t{Name} must be an atom. The
alias can be used instead of the file descriptor for every operation alias can be used instead of the stream descriptor for every operation
concerning the file. concerning the stream.
The operation will fail and give an error if the alias name is already The operation will fail and give an error if the alias name is already
in use. YAP allows several aliases for the same file, but only in use. YAP allows several aliases for the same file, but only

2
pl/errors.yap
View File

@ -86,7 +86,7 @@ print_message(Level, Mss) :-
'$format'(user_error,"[ CONTEXT ERROR- ~w: ~w appeared in ~w ]~n", '$format'(user_error,"[ CONTEXT ERROR- ~w: ~w appeared in ~w ]~n",
[Goal,Who,Where]). [Goal,Who,Where]).
'$output_error_message'(domain_error(array_overflow,Opt), Where) :- '$output_error_message'(domain_error(array_overflow,Opt), Where) :-
'$format'(user_error,"[ DOMAIN ERROR- ~w: invalid index for array ~w ]~n", '$format'(user_error,"[ DOMAIN ERROR- ~w: invalid index ~w for array ]~n",
[Where,Opt]). [Where,Opt]).
'$output_error_message'(domain_error(array_type,Opt), Where) :- '$output_error_message'(domain_error(array_type,Opt), Where) :-
'$format'(user_error,"[ DOMAIN ERROR- ~w: invalid static array type ~w ]~n", '$format'(user_error,"[ DOMAIN ERROR- ~w: invalid static array type ~w ]~n",