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

fix small bugs in SWI interface

Browse Source
This commit is contained in:
Vitor Santos Costa 2010-07-19 14:54:21 +01:00
parent 907dd74dd0
commit 6731383b07
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/yap2swi/yap2swi.c
View File

@ -1649,7 +1649,10 @@ X_API int PL_unify_functor(term_t t, functor_t f)
YAP long int unify(YAP_Term* a, Term* b) */ YAP long int unify(YAP_Term* a, Term* b) */
X_API int PL_unify_int64(term_t t, int64_t n) X_API int PL_unify_int64(term_t t, int64_t n)
{ {
#if USE_GMP #if SIZEOF_INT_P==8
Term iterm = MkIntegerTerm(n);
return Yap_unify(Yap_GetFromSlot(t),iterm);
#elif USE_GMP
YAP_Term iterm; YAP_Term iterm;
char s[64]; char s[64];
MP_INT rop; MP_INT rop;
@ -1665,8 +1668,10 @@ X_API int PL_unify_int64(term_t t, int64_t n)
iterm = YAP_MkBigNumTerm((void *)&rop); iterm = YAP_MkBigNumTerm((void *)&rop);
return YAP_Unify(Yap_GetFromSlot(t),iterm); return YAP_Unify(Yap_GetFromSlot(t),iterm);
#else #else
fprintf(stderr,"Error: please install GM\n");
return FALSE; return FALSE;
#endif #endif
} }
/* SWI: int PL_unify_list(term_t ?t, term_t +h, term_t -t) /* SWI: int PL_unify_list(term_t ?t, term_t +h, term_t -t)
@ -1985,6 +1990,9 @@ X_API int PL_unify_term(term_t l,...)
case PL_SHORT: case PL_SHORT:
*pt++ = MkIntegerTerm(va_arg(ap, int)); *pt++ = MkIntegerTerm(va_arg(ap, int));
break; break;
case PL_LONG:
*pt++ = MkIntegerTerm(va_arg(ap, long));
break;
case PL_INT: case PL_INT:
*pt++ = MkIntegerTerm(va_arg(ap, int)); *pt++ = MkIntegerTerm(va_arg(ap, int));
break; break;
@ -2625,7 +2633,15 @@ X_API qid_t PL_open_query(module_t ctx, int flags, predicate_t p, term_t t0)
Functor f = Yap_MkFunctor(yname, arity); Functor f = Yap_MkFunctor(yname, arity);
t[1] = Yap_MkApplTerm(f,arity,Yap_AddressFromSlot(t0)); t[1] = Yap_MkApplTerm(f,arity,Yap_AddressFromSlot(t0));
} }
execution->g = Yap_MkApplTerm(FunctorModule,2,t); if (ctx) {
Term ti;
t[0] = MkAtomTerm((Atom)ctx);
ti = Yap_MkApplTerm(FunctorModule,2,t);
t[0] = ti;
execution->g = Yap_MkApplTerm(FunctorCall,1,t);
} else {
execution->g = t[1];
}
return execution; return execution;
} }