upgrade to latest SWI

include/SWI-Prolog.h

@@ -443,6 +443,7 @@ extern X_API int PL_get_name_arity(term_t, atom_t *, int *);
 extern X_API int PL_get_nil(term_t);
 extern X_API int PL_get_pointer(term_t, void **);
 extern X_API int PL_get_intptr(term_t, intptr_t *);
+extern X_API int PL_get_uintptr(term_t, uintptr_t *);
 extern X_API int PL_get_tail(term_t, term_t);
 /* end PL_get_* functions  =============================*/
 /* begin PL_new_* functions =============================*/
@@ -702,7 +703,9 @@ PL_EXPORT(void*)	PL_blob_data(atom_t a,
 
 PL_EXPORT(void)		PL_register_blob_type(PL_blob_t *type);
 PL_EXPORT(PL_blob_t*)	PL_find_blob_type(const char* name);
+PL_EXPORT(PL_blob_t*)	YAP_find_blob_type(YAP_Atom at);
 PL_EXPORT(int)		PL_unregister_blob_type(PL_blob_t *type);
+PL_EXPORT(int)  PL_raise(int sig);
 
 
 #if USE_GMP
@@ -717,7 +720,6 @@ extern X_API  const char *PL_cwd(void);
 
 void swi_install(void);
 
-X_API int PL_error(const char *pred, int arity, const char *msg, int id, ...);
 X_API int PL_warning(const char *msg, ...);
 
 

include/SWI-Stream.h

@@ -164,6 +164,8 @@ typedef struct io_stream
   struct io_stream *	upstream;	/* stream providing our input */
   struct io_stream *	downstream;	/* stream providing our output */
   unsigned		newline : 2;	/* Newline mode */
+  unsigned		erased : 1;	/* Stream was erased */
+  unsigned		references : 4;	/* Reference-count */
   int			io_errno;	/* Save errno value */
   void *		exception;	/* pending exception (record_t) */
   intptr_t		reserved[2];	/* reserved for extension */
@@ -235,6 +237,8 @@ PL_EXPORT_DATA(IOSTREAM)    S__iob[3];		/* Libs standard streams */
 					    : S__fillbuf(s))
 #define Sgetc(s) S__updatefilepos_getc((s), Snpgetc(s))
 
+PL_EXPORT(int)		Speekcode(IOSTREAM *s);
+
 /* Control-operations */
 #define SIO_GETSIZE	(1)		/* get size of underlying object */
 #define SIO_GETFILENO	(2)		/* get underlying file (if any) */

include/YapInterface.h

@@ -66,6 +66,7 @@ __BEGIN_DECLS
 /* Primitive Functions */
 
 #define YAP_Deref(t)  (t)
+
 extern X_API YAP_Term PROTO(YAP_A,(int));
 #define YAP_ARG1	YAP_A(1)
 #define YAP_ARG2	YAP_A(2)
@@ -151,7 +152,7 @@ extern X_API YAP_Atom PROTO(YAP_LookupWideAtom,(CONST wchar_t *));
 extern X_API YAP_Atom PROTO(YAP_FullLookupAtom,(CONST char *));
 
 /*    int  AtomNameLength(Atom) */
-extern X_API int PROTO(YAP_AtomNameLength,(YAP_Atom));
+extern X_API size_t PROTO(YAP_AtomNameLength,(YAP_Atom));
 
 /*    const char* IsWideAtom(YAP_Atom) */
 extern X_API int *PROTO(YAP_IsWideAtom,(YAP_Atom));
@@ -174,6 +175,9 @@ extern X_API YAP_Term PROTO(YAP_HeadOfTerm,(YAP_Term));
 /*    Term  TailOfTerm(Term)  */
 extern X_API YAP_Term PROTO(YAP_TailOfTerm,(YAP_Term));
 
+/*    Int  AddressOfTailOfTerm(Term *, Term **)  */
+extern X_API YAP_Int PROTO(YAP_SkipList,(YAP_Term *, YAP_Term **));
+
 /*    Term  TailOfTerm(Term)  */
 extern X_API YAP_Term PROTO(YAP_TermNil,(void));
 
@@ -417,9 +421,12 @@ extern X_API YAP_Int PROTO(YAP_InitSlot,(YAP_Term));
 /*  YAP_Term  YAP_GetFromSlots(t)  */
 extern X_API YAP_Term PROTO(YAP_GetFromSlot,(YAP_Int));
 
-/*  YAP_Term  YAP_AddressFromSlots(t)  */
+/*  YAP_Term  *YAP_AddressFromSlots(t)  */
 extern X_API YAP_Term *PROTO(YAP_AddressFromSlot,(YAP_Int));
 
+/*  YAP_Term  *YAP_AddressOfTermInSlot(t)  */
+extern X_API YAP_Term *PROTO(YAP_AddressOfTermInSlot,(YAP_Int));
+
 /*  YAP_Term  YAP_PutInSlots(t)  */
 extern X_API void PROTO(YAP_PutInSlot,(YAP_Int, YAP_Term));
 
@@ -521,6 +528,15 @@ extern X_API void       PROTO(YAP_signal,(int));
 /*  stack expansion control */
 extern X_API int        PROTO(YAP_SetYAPFlag,(yap_flag_t,int));
 
+/*    void  *YAP_GlobalBase(Term)  */
+extern X_API YAP_Int PROTO(YAP_VarSlotToNumber,(YAP_Int));
+
+/*    Term  YAP_ModuleUser()  */
+extern X_API YAP_Term PROTO(YAP_ModuleUser,(void));
+
+/*    Int  YAP_NumberOfClausesForPredicate()  */
+extern X_API YAP_Int PROTO(YAP_NumberOfClausesForPredicate,(YAP_PredEntryPtr));
+
 #define YAP_InitCPred(N,A,F)  YAP_UserCPredicate(N,F,A)
 
 __END_DECLS