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

fix atom_length/2 ISO.

Browse Source
This commit is contained in:
Vítor Santos Costa 2012-09-27 22:32:12 +01:00
parent 76088ca8b3
commit 169339d5be
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
C/stdpreds.c
View File

@ -2021,14 +2021,25 @@ p_atom_length( USES_REGS1 )
Term t1 = Deref(ARG1); Term t1 = Deref(ARG1);
Term t2 = Deref(ARG2); Term t2 = Deref(ARG2);
Atom at; Atom at;
Int len = 0;
if (!IsVarTerm(t2)) {
if (!IsIntegerTerm(t2)) {
Yap_Error(TYPE_ERROR_INTEGER, t2, "atom_length/2");
return(FALSE);
}
if ((len = IntegerOfTerm(t2)) < 0) {
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atom_length/2");
return(FALSE);
}
}
restart_aux: restart_aux:
if (IsVarTerm(t1)) { if (IsVarTerm(t1)) {
Yap_Error(INSTANTIATION_ERROR, t1, "atom_length/2"); Yap_Error(INSTANTIATION_ERROR, t1, "atom_length/2");
return(FALSE); return(FALSE);
} }
if (Yap_IsStringTerm(t1)) { if (Yap_IsStringTerm(t1)) {
size_t len;
if (Yap_IsWideStringTerm(t1)) { if (Yap_IsWideStringTerm(t1)) {
len = wcslen(Yap_BlobWideStringOfTerm(t1)); len = wcslen(Yap_BlobWideStringOfTerm(t1));
} else { } else {
@ -2067,15 +2078,7 @@ p_atom_length( USES_REGS1 )
} }
at = AtomOfTerm(t1); at = AtomOfTerm(t1);
if (!IsVarTerm(t2)) { if (!IsVarTerm(t2)) {
size_t len; /* len is given from above */
if (!IsIntegerTerm(t2)) {
Yap_Error(TYPE_ERROR_INTEGER, t2, "atom_length/2");
return(FALSE);
}
if ((len = IntegerOfTerm(t2)) < 0) {
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atom_length/2");
return(FALSE);
}
if (IsWideAtom(at)) { if (IsWideAtom(at)) {
return wcslen((wchar_t *)RepAtom(at)->StrOfAE) == len; return wcslen((wchar_t *)RepAtom(at)->StrOfAE) == len;
} else { } else {