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

new interface pedicates

Browse Source 
fixes to bad implementation.
This commit is contained in:
Vítor Santos Costa 2010-06-23 11:44:21 +01:00
parent e72ce435d9
commit d22cb9b6ab
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/SWI-Prolog.h
View File

@ -457,6 +457,7 @@ extern X_API int PL_is_compound(term_t);
extern X_API int PL_is_float(term_t);
extern X_API int PL_is_functor(term_t, functor_t);
extern X_API int PL_is_ground(term_t);
extern X_API int PL_is_callable(term_t);
extern X_API int PL_is_integer(term_t);
extern X_API int PL_is_list(term_t);
extern X_API int PL_is_number(term_t);
@ -617,6 +618,12 @@ PL_EXPORT(intptr_t) PL_foreign_context(control_t);
PL_EXPORT(void *) PL_foreign_context_address(control_t);
/* SWI stream info */
PL_EXPORT(void) PL_YAP_InitSWIIO(functor_t f,
void *gc,
void *pc,
void *cc);
#ifdef __cplusplus
}

39
library/yap2swi/yap2swi.c
View File

@ -167,8 +167,8 @@ SWIFunctorToFunctor(functor_t at)
{
if (IsAtomTerm(at))
return (Functor)at;
if (IsApplTerm(at))
return SWI_Functors[((CELL)RepAppl((CELL)at))/sizeof(CELL)];
if ((CELL)(at) & 1)
return SWI_Functors[((CELL)at)/2];
return (Functor)at;
}
@ -181,7 +181,7 @@ Yap_InitSWIHash(void)
add_to_hash(i*2+1, (ADDR)SWI_Atoms[i]);
}
for (j=0; j < N_SWI_FUNCTORS; j++) {
add_to_hash(AbsAppl((CELL *)(j*sizeof(CELL))), (ADDR)SWI_Functors[j]);
add_to_hash((((CELL)(j))*2+1), (ADDR)SWI_Functors[j]);
}
}
@ -1512,6 +1512,17 @@ X_API int PL_error(const char *pred, int arity, const char *msg, int id, ...)
PL_ATOM, what);
break;
}
case ERR_STREAM_OP:
{ atom_t action = va_arg(args, atom_t);
term_t stream = va_arg(args, term_t);
int rc;
rc = PL_unify_term(formal,
PL_FUNCTOR, FUNCTOR_io_error2,
PL_ATOM, action,
PL_TERM, stream);
break;
}
default:
fprintf(stderr, "unimplemented SWI error %d\n",id);
@ -2189,6 +2200,18 @@ X_API int PL_is_ground(term_t t)
return Yap_IsGroundTerm(Yap_GetFromSlot(t));
}
X_API int PL_is_callable(term_t t)
{
YAP_Term t1 = Yap_GetFromSlot(t);
if (IsVarTerm(t1))
return FALSE;
if (IsAtomTerm(t1) || IsPairTerm(t1))
return TRUE;
if (IsApplTerm(t1) && !IsExtensionFunctor(FunctorOfTerm(t1)))
return TRUE;
return FALSE;
}
X_API int PL_is_atomic(term_t ts)
{
YAP_Term t = Yap_GetFromSlot(ts);
@ -2981,6 +3004,16 @@ PL_blob_data(term_t ts, size_t *len, PL_blob_t **type)
return (void *)(&b->blob_data);
}
/* glue function to connect back PLStream to YAP IO */
X_API void
PL_YAP_InitSWIIO(functor_t f, void * gc, void * pc, void* cc)
{
FSWIStream = SWIFunctorToFunctor(f);
SWIGetc = gc;
SWIPutc = pc;
SWIClose = cc;
}
X_API void (*PL_signal(int sig, void (*func)(int)))(int)
{