Merge branch 'master' of /yap-6.3

Conflicts:
	C/c_interface.c
This commit is contained in:
Vitor Santos Costa
2011-02-03 11:33:50 +00:00
12 changed files with 2922 additions and 51 deletions

View File

@@ -2722,9 +2722,23 @@ X_API void PL_register_foreign_in_module(const char *module, const char *name, i
X_API void PL_register_extensions(const PL_extension *ptr)
{
// implemented as register foreign
// may cause problems during initialization?
PL_load_extensions(ptr);
}
X_API void
PL_register_extensions_in_module(const char *module, const PL_extension *e)
{
// implemented as register foreign
/* ignore flags for now */
while(e->predicate_name != NULL) {
PL_register_foreign_in_module(module, e->predicate_name, e->arity, e->function, e->flags);
e++;
}
}
X_API void PL_register_foreign(const char *name, int arity, pl_function_t function, int flags)
{
PL_register_foreign_in_module(NULL, name, arity, function, flags);
@@ -3163,6 +3177,17 @@ X_API void PL_on_halt(void (*f)(int, void *), void *closure)
Yap_HaltRegisterHook((HaltHookFunc)f,closure);
}
X_API char *PL_atom_generator(const char *prefix, int state)
{
return NULL;
}
X_API pl_wchar_t *PL_atom_generator_w(const pl_wchar_t *pref, pl_wchar_t *buffer, size_t buflen, int state)
{
return NULL;
}
void
Yap_swi_install(void)
{