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

fix equality between float and integer, and simplify code in general.

Browse Source
This commit is contained in:
Vitor Santos Costa 2009-02-27 22:10:52 +00:00
parent d4eb240c41
commit 0b4b0d0a18
1 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
C/cmppreds.c
View File

@ -572,7 +572,7 @@ a_cmp(Term t1, Term t2)
Int i2 = IntegerOfTerm(t2); Int i2 = IntegerOfTerm(t2);
return flt_cmp(f1-i2); return flt_cmp(f1-i2);
} else if (IsFloatTerm(t2)) { } else if (IsFloatTerm(t2)) {
Float f2 = FloatOfTerm(2); Float f2 = FloatOfTerm(t2);
return flt_cmp(f1-f2); return flt_cmp(f1-f2);
} else if (IsBigIntTerm(t2)) { } else if (IsBigIntTerm(t2)) {
#ifdef USE_GMP #ifdef USE_GMP
@ -595,7 +595,7 @@ a_cmp(Term t1, Term t2)
Float f2 = FloatOfTerm(t2); Float f2 = FloatOfTerm(t2);
return flt_cmp(mpz_get_d(b1)-f2); return flt_cmp(mpz_get_d(b1)-f2);
} else if (IsBigIntTerm(t2)) { } else if (IsBigIntTerm(t2)) {
MP_INT *b2 = Yap_BigIntOfTerm(2); MP_INT *b2 = Yap_BigIntOfTerm(t2);
return int_cmp(mpz_cmp(b1,b2)); return int_cmp(mpz_cmp(b1,b2));
} else { } else {
return FALSE; return FALSE;
@ -628,48 +628,21 @@ a_eq(Term t1, Term t2)
Yap_Error(INSTANTIATION_ERROR, t2, "=:=/2"); Yap_Error(INSTANTIATION_ERROR, t2, "=:=/2");
return(FALSE); return(FALSE);
} }
if (IsFloatTerm(t1) && IsFloatTerm(t2)) if (IsFloatTerm(t1)) {
return (FloatOfTerm(t1) == FloatOfTerm(t2)); if (IsFloatTerm(t2))
if (IsIntegerTerm(t1) && IsIntegerTerm(t2)) return (FloatOfTerm(t1) == FloatOfTerm(t2));
return (IntegerOfTerm(t1) == IntegerOfTerm(t2)); else if (IsIntegerTerm(t2)) {
t1 = Yap_Eval(t1); return (FloatOfTerm(t1) == IntegerOfTerm(t2));
if (IsIntegerTerm(t1)) {
t2 = Yap_Eval(t2);
Int i1 = IntegerOfTerm(t1);
if (IsIntegerTerm(t2)) {
Int i2 = IntegerOfTerm(t2);
return(i1==i2);
} else {
return FALSE;
} }
} else if (IsFloatTerm(t1)) {
t2 = Yap_Eval(t2);
Float f1 = FloatOfTerm(t1);
if (IsFloatTerm(t2)) {
Float f2 = FloatOfTerm(2);
return(f1 == f2);
} else {
return FALSE;
}
} else if (IsBigIntTerm(t1)) {
#ifdef USE_GMP
{
t2 = Yap_Eval(t2);
MP_INT *b1 = Yap_BigIntOfTerm(t1);
if (IsBigIntTerm(t2)) {
MP_INT *b2 = Yap_BigIntOfTerm(2);
return(mpz_cmp(b1,b2) == 0);
} else {
return(FALSE);
}
}
#endif
} else {
return(FALSE);
} }
if (IsIntegerTerm(t1)) {
if (IsIntegerTerm(t2)) {
return (IntegerOfTerm(t1) == IntegerOfTerm(t2));
} else if (IsFloatTerm(t2)) {
return (FloatOfTerm(t2) == IntegerOfTerm(t1));
}
}
return (a_cmp(t1,t2) == 0);
} }
static Int static Int