Merge branch 'master' into cargs2-dev

CHANGELOG.md

@@ -5,6 +5,7 @@
 Features
 
 - Arthur Maciel added `opaque?` and `opaque-null?` predicates to `(cyclone foreign)`.
+- Added `import-shared-object` to `(scheme eval)` to allow loading a third party C shared library.
 
 Bug Fixes
 

runtime.c

@@ -6828,6 +6828,11 @@ void Cyc_import_shared_object(void *data, object cont, object filename, object e
   }
   dlerror();    /* Clear any existing error */
 
+  if (string_len(entry_pt_fnc) == 0) {
+    // No entry point so this is a third party library.
+    // Just call into our continuation
+    return_closcall1(data, cont, boolean_t);
+  } else {
     entry_pt = (function_type) dlsym(handle, string_str(entry_pt_fnc));
     if (entry_pt == NULL) {
       snprintf(buffer, 256, "%s, %s, %s", string_str(filename), string_str(entry_pt_fnc), dlerror());
@@ -6837,6 +6842,7 @@ void Cyc_import_shared_object(void *data, object cont, object filename, object e
     mclosure1(clo, entry_pt, cont);
     object buf[1] = {&clo};
     entry_pt(data, &clo, 1, buf);
+  }
 }
 
 /** Read */

scheme/eval.sld

@@ -26,6 +26,8 @@
     %import
     imported?
     %set-import-dirs!
+    import-shared-object
+    ;; Macros
     *defined-macros* 
     get-macros
     macro:macro?
@@ -810,6 +812,9 @@
 (define (imported? lis)
   (c:lib-loaded? (lib:name->unique-string (lib:list->import-set lis))))
 
+(define (import-shared-object filename)
+  (c:import-shared-obj filename ""))
+
 ;; Wrapper around the actual shared object import function
 (define-c c:import-shared-obj
   "(void *data, int argc, closure _, object k, object fn, object entry_fnc)"