Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-14 08:27:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow both builtin foreign libraries and dynamically loaded libraries.

Browse source
This commit is contained in:
Alex Shinn 2014-12-22 18:14:38 +09:00
parent 6b369c58a0
commit 62a58894c6
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
eval.c
View file

@ -1241,7 +1241,7 @@ static struct sexp_library_entry_t *sexp_find_static_library(const char *file)
return entry; return entry;
return NULL; return NULL;
} }
static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) { static sexp sexp_load_builtin (sexp ctx, sexp file, sexp env) {
struct sexp_library_entry_t *entry = sexp_find_static_library(sexp_string_data(file)); struct sexp_library_entry_t *entry = sexp_find_static_library(sexp_string_data(file));
if (! entry) if (! entry)
return sexp_compile_error(ctx, "couldn't find builtin library", file); return sexp_compile_error(ctx, "couldn't find builtin library", file);
@ -1249,6 +1249,9 @@ static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) {
} }
#else #else
#define sexp_find_static_library(path) NULL #define sexp_find_static_library(path) NULL
#define sexp_load_builtin(ctx, file, env) SEXP_UNDEF
#endif
#if SEXP_USE_DL #if SEXP_USE_DL
#ifdef __MINGW32__ #ifdef __MINGW32__
#include <windows.h> #include <windows.h>
@ -1256,10 +1259,10 @@ static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) {
sexp res; sexp res;
sexp_init_proc init; sexp_init_proc init;
HINSTANCE handle = LoadLibraryA(sexp_string_data(file)); HINSTANCE handle = LoadLibraryA(sexp_string_data(file));
if(!handle) if (!handle)
return sexp_compile_error(ctx, "couldn't load dynamic library", file); return sexp_compile_error(ctx, "couldn't load dynamic library", file);
init = (sexp_init_proc) GetProcAddress(handle, "sexp_init_library"); init = (sexp_init_proc) GetProcAddress(handle, "sexp_init_library");
if(!init) { if (!init) {
FreeLibrary(handle); FreeLibrary(handle);
return sexp_compile_error(ctx, "dynamic library has no sexp_init_library", file); return sexp_compile_error(ctx, "dynamic library has no sexp_init_library", file);
} }
@ -1278,8 +1281,9 @@ static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) {
sexp_init_proc init; sexp_init_proc init;
sexp_gc_var2(res, old_dl); sexp_gc_var2(res, old_dl);
void *handle = dlopen(sexp_string_data(file), RTLD_LAZY); void *handle = dlopen(sexp_string_data(file), RTLD_LAZY);
if (! handle) if (! handle) {
return sexp_compile_error(ctx, "couldn't load dynamic library", file); return sexp_compile_error(ctx, "couldn't load dynamic library", file);
}
init = dlsym(handle, "sexp_init_library"); init = dlsym(handle, "sexp_init_library");
if (! init) { if (! init) {
dlclose(handle); dlclose(handle);
@ -1298,7 +1302,17 @@ static sexp sexp_load_dl (sexp ctx, sexp file, sexp env) {
return res; return res;
} }
#endif #endif
#else
#define sexp_load_dl(ctx, file, env) SEXP_UNDEF
#endif #endif
#if SEXP_USE_DL || SEXP_USE_STATIC_LIBS
static sexp sexp_load_binary(sexp ctx, sexp source, sexp env) {
sexp res = sexp_load_dl(ctx, source, env);
if (res == SEXP_UNDEF || sexp_exceptionp(res))
res = sexp_load_builtin(ctx, source, env);
return res;
}
#endif #endif
sexp sexp_load_op (sexp ctx, sexp self, sexp_sint_t n, sexp source, sexp env) { sexp sexp_load_op (sexp ctx, sexp self, sexp_sint_t n, sexp source, sexp env) {
@ -1312,7 +1326,7 @@ sexp sexp_load_op (sexp ctx, sexp self, sexp_sint_t n, sexp source, sexp env) {
suffix = sexp_stringp(source) ? sexp_string_data(source) suffix = sexp_stringp(source) ? sexp_string_data(source)
+ sexp_string_size(source) - strlen(sexp_so_extension) : "..."; + sexp_string_size(source) - strlen(sexp_so_extension) : "...";
if (strcmp(suffix, sexp_so_extension) == 0) { if (strcmp(suffix, sexp_so_extension) == 0) {
res = sexp_load_dl(ctx, source, env); res = sexp_load_binary(ctx, source, env);
} else { } else {
#endif #endif
res = SEXP_VOID; res = SEXP_VOID;