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

fix Yap_compare_terms for 64 bit code.

Browse Source
This commit is contained in:
Vítor Santos Costa 2011-11-04 11:41:35 +09:00
parent f8e3c7d347
commit e283f6406a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
C/cmppreds.c
View File

@ -317,8 +317,9 @@ compare(Term t1, Term t2) /* compare terms t1 and t2 */
return 1; return 1;
return -1; return -1;
} else { } else {
if (IsIntTerm(t2)) if (IsIntTerm(t2)) {
return IntOfTerm(t1) - IntOfTerm(t2); return IntOfTerm(t1) - IntOfTerm(t2);
}
if (IsFloatTerm(t2)) { if (IsFloatTerm(t2)) {
return 1; return 1;
} }
@ -441,9 +442,9 @@ compare(Term t1, Term t2) /* compare terms t1 and t2 */
} }
} }
int Yap_compare_terms(CELL d0, CELL d1) Int Yap_compare_terms(Term d0, Term d1)
{ {
return (compare(Deref(d0),Deref(d1))); return compare(Deref(d0),Deref(d1));
} }
static Int static Int

4
C/sort.c
View File

@ -267,14 +267,14 @@ Int compact_mergesort(CELL *pt, Int size, int my_p)
while (pt_left < end_pt_left && pt_right < end_pt_right) { while (pt_left < end_pt_left && pt_right < end_pt_right) {
/* if the element to the left is larger than the one to the right */ /* if the element to the left is larger than the one to the right */
Int cmp = Yap_compare_terms(pt_left[0], pt_right[0]); Int cmp = Yap_compare_terms(pt_left[0], pt_right[0]);
if (cmp < 0) { if (cmp < (Int)0) {
/* copy the one to the left */ /* copy the one to the left */
pt[0] = pt_left[0]; pt[0] = pt_left[0];
/* and avance the two pointers */ /* and avance the two pointers */
pt += 2; pt += 2;
size ++; size ++;
pt_left += 2; pt_left += 2;
} else if (cmp == 0) { } else if (cmp == (Int)0) {
/* otherwise, just skip one of them, anyone */ /* otherwise, just skip one of them, anyone */
pt_left += 2; pt_left += 2;
} else { } else {

2
H/Yapproto.h
View File

@ -140,7 +140,7 @@ void STD_PROTO(Yap_AssertzClause,(struct pred_entry *, yamop *));
/* cmppreds.c */ /* cmppreds.c */
int STD_PROTO(Yap_compare_terms,(Term,Term)); Int STD_PROTO(Yap_compare_terms,(Term,Term));
void STD_PROTO(Yap_InitCmpPreds,(void)); void STD_PROTO(Yap_InitCmpPreds,(void));
/* compiler.c */ /* compiler.c */