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

Paulo Moura: fix atom_length/2 e atomic_length/2.

Browse Source
This commit is contained in:
Vítor Santos Costa 2014-10-22 17:54:50 +01:00
parent 0367f52840
commit 171dca1c8c
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
C/atomic.c
View File

@ -1225,23 +1225,29 @@ p_atomics_to_string3( USES_REGS1 )
static Int static Int
p_atom_length( USES_REGS1 ) p_atom_length( USES_REGS1 )
{ {
Term t1; Term t1 = Deref(ARG1);;
Term t2 = Deref(ARG2); Term t2 = Deref(ARG2);
ssize_t len; ssize_t len;
if (!Yap_IsGroundTerm(t1)) {
Yap_Error(INSTANTIATION_ERROR, t1, "atom_length/2");
return(FALSE);
} else if (!IsAtomTerm(t1)) {
Yap_Error(TYPE_ERROR_ATOM, t1, "atom_length/2");
return(FALSE);
}
if (Yap_IsGroundTerm(t2)) { if (Yap_IsGroundTerm(t2)) {
if (!IsIntegerTerm(t2)) { if (!IsIntegerTerm(t2)) {
Yap_Error(TYPE_ERROR_INTEGER, t2, "atom_length/2"); Yap_Error(TYPE_ERROR_INTEGER, t2, "atom_length/2");
return(FALSE); return(FALSE);
} } else if ((len = IntegerOfTerm(t2)) < 0) {
if (FALSE && (len = IntegerOfTerm(t2)) < 0) {
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atom_length/2"); Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atom_length/2");
return(FALSE); return(FALSE);
} }
} }
restart_aux: restart_aux:
t1 = Deref(ARG1);
len = Yap_AtomicToLength(t1 PASS_REGS); len = Yap_AtomicToLength(t1 PASS_REGS);
if (len != (size_t)-1) if (len != (size_t)-1)
return Yap_unify( ARG2, MkIntegerTerm(len) ); return Yap_unify( ARG2, MkIntegerTerm(len) );
@ -1255,23 +1261,30 @@ restart_aux:
static Int static Int
p_atomic_length( USES_REGS1 ) p_atomic_length( USES_REGS1 )
{ {
Term t1; Term t1 = Deref(ARG1);
Term t2 = Deref(ARG2); Term t2 = Deref(ARG2);
ssize_t len; ssize_t len;
if (!Yap_IsGroundTerm(t1)) {
Yap_Error(INSTANTIATION_ERROR, t1, "atomic_length/2");
return(FALSE);
} else if (!IsAtomicTerm(t1)) {
Yap_Error(TYPE_ERROR_ATOM, t1, "atomic_length/2");
return(FALSE);
}
if (Yap_IsGroundTerm(t2)) { if (Yap_IsGroundTerm(t2)) {
if (!IsIntegerTerm(t2)) { if (!IsIntegerTerm(t2)) {
Yap_Error(TYPE_ERROR_INTEGER, t2, "atomic_length/2"); Yap_Error(TYPE_ERROR_INTEGER, t2, "atomic_length/2");
return(FALSE); return(FALSE);
} }
if (FALSE && (len = IntegerOfTerm(t2)) < 0) { if ((len = IntegerOfTerm(t2)) < 0) {
Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atomic_length/2"); Yap_Error(DOMAIN_ERROR_NOT_LESS_THAN_ZERO, t2, "atomic_length/2");
return(FALSE); return(FALSE);
} }
} }
restart_aux: restart_aux:
t1 = Deref(ARG1);
len = Yap_AtomicToLength(t1 PASS_REGS); len = Yap_AtomicToLength(t1 PASS_REGS);
if (len != (size_t)-1) if (len != (size_t)-1)
return Yap_unify( ARG2, MkIntegerTerm(len) ); return Yap_unify( ARG2, MkIntegerTerm(len) );