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

accept more version sof atom_length (SWI).

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-03-14 20:53:48 +00:00
parent a358355709
commit ae702e6dd5
1 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
C/stdpreds.c
View File

@ -1761,13 +1761,48 @@ p_atom_length( USES_REGS1 )
Term t2 = Deref(ARG2); Term t2 = Deref(ARG2);
Atom at; Atom at;
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 (!IsAtomTerm(t1)) { if (Yap_IsStringTerm(t1)) {
Yap_Error(TYPE_ERROR_ATOM, t1, "atom_length/2"); size_t len;
return(FALSE); if (Yap_IsWideStringTerm(t1)) {
len = wcslen(Yap_BlobWideStringOfTerm(t1));
} else {
len = strlen(Yap_BlobStringOfTerm(t1));
}
return Yap_unify(ARG2, MkIntegerTerm(len));
} else if (!IsAtomTerm(t1)) {
if (!yap_flags[STRICT_ISO_FLAG]) {
char *String;
if (IsIntegerTerm(t1)) {
String = Yap_PreAllocCodeSpace();
if (String + 1024 > (char *)AuxSp)
goto expand_auxsp;
sprintf(String, Int_FORMAT, IntegerOfTerm(t1));
} else if (IsFloatTerm(t1)) {
String = Yap_PreAllocCodeSpace();
if (String + 1024 > (char *)AuxSp)
goto expand_auxsp;
sprintf(String, "%f", FloatOfTerm(t1));
#if USE_GMP
} else if (IsBigIntTerm(t1)) {
String = Yap_PreAllocCodeSpace();
if (!Yap_gmp_to_string(t1, String, ((char *)AuxSp-String)-1024, 10 ))
goto expand_auxsp;
#endif
} else {
Yap_Error(TYPE_ERROR_ATOM, t1, "atom_length/2");
return FALSE;
}
return Yap_unify(ARG2, MkIntegerTerm(strlen(String)));
} else {
Yap_Error(TYPE_ERROR_ATOM, t1, "atom_length/2");
return FALSE;
}
} }
at = AtomOfTerm(t1); at = AtomOfTerm(t1);
if (!IsVarTerm(t2)) { if (!IsVarTerm(t2)) {
@ -1797,6 +1832,18 @@ p_atom_length( USES_REGS1 )
tj = MkIntegerTerm(len); tj = MkIntegerTerm(len);
return Yap_unify_constant(t2,tj); return Yap_unify_constant(t2,tj);
} }
expand_auxsp:
{
char *String = Yap_ExpandPreAllocCodeSpace(0,NULL, TRUE);
if (String + 1024 > (char *)AuxSp) {
/* crash in flames */
Yap_Error(OUT_OF_AUXSPACE_ERROR, ARG1, "allocating temp space in name/2");
return FALSE;
}
t1 = Deref(ARG1);
t2 = Deref(ARG2);
goto restart_aux;
}
} }