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

fix annoying int cast problems (64 bit only)

This commit is contained in:
Costa Vitor 2009-05-22 19:09:18 -05:00
parent 8fcc534a19
commit e611e1061a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
C/cmppreds.c
View File

@ -511,13 +511,13 @@ p_compare(void)
return Yap_unify_constant(ARG1, MkAtomTerm(p)); return Yap_unify_constant(ARG1, MkAtomTerm(p));
} }
inline static int inline static Int
int_cmp(Int dif) int_cmp(Int dif)
{ {
return dif; return dif;
} }
inline static int inline static Int
flt_cmp(Float dif) flt_cmp(Float dif)
{ {
if (dif < 0.0) if (dif < 0.0)
@ -528,7 +528,7 @@ flt_cmp(Float dif)
} }
static inline int static inline Int
a_cmp(Term t1, Term t2) a_cmp(Term t1, Term t2)
{ {
if (IsVarTerm(t1)) { if (IsVarTerm(t1)) {
@ -540,10 +540,10 @@ a_cmp(Term t1, Term t2)
return FALSE; return FALSE;
} }
if (IsFloatTerm(t1) && IsFloatTerm(t2)) { if (IsFloatTerm(t1) && IsFloatTerm(t2)) {
return(flt_cmp(FloatOfTerm(t1)-FloatOfTerm(t2))); return flt_cmp(FloatOfTerm(t1)-FloatOfTerm(t2));
} }
if (IsIntegerTerm(t1) && IsIntegerTerm(t2)) { if (IsIntegerTerm(t1) && IsIntegerTerm(t2)) {
return(int_cmp(IntegerOfTerm(t1)-IntegerOfTerm(t2))); return int_cmp(IntegerOfTerm(t1)-IntegerOfTerm(t2));
} }
t1 = Yap_Eval(t1); t1 = Yap_Eval(t1);
if (!t1) return FALSE; if (!t1) return FALSE;