COMMON: defer call to module init function

Author: chrisw-s

src/common/extlib.c

@@ -37,8 +37,7 @@
 typedef int (*sblib_exec_fn)(int, int, slib_par_t *, var_t *);
 typedef int (*sblib_getname_fn) (int, char *);
 typedef int (*sblib_count_fn) (void);
-typedef const char *(*sblib_get_module_name_fn) (void);
-typedef int (*sblib_init_fn) (void);
+typedef int (*sblib_init_fn) (const char *);
 typedef void (*sblib_close_fn) (void);
 
 typedef struct {
@@ -278,13 +277,18 @@ void slib_import(int lib_id, int comp) {
     slib_import_routines(lib, comp);
     lib->imported = 1;
   }
+  if (lib && !comp) {
+    sblib_init_fn minit = slib_getoptptr(lib, "sblib_init");
+    if (minit && !minit(gsb_last_file)) {
+      rt_raise("LIB: %s->sblib_init(), failed", lib->name);
+    }
+  }
 }
 
 /**
- * opens the library and invokes the init function
+ * opens the library
  */
 void slib_open(const char *fullname, const char *name) {
-  int success = 0;
   int name_index = 0;
 
   if (strncmp(name, "lib", 3) == 0) {
@@ -303,30 +307,12 @@ void slib_open(const char *fullname, const char *name) {
     log_printf("LIB: importing %s", fullname);
   }
   if (slib_llopen(lib)) {
-    success = 1;
-
-    // init
-    sblib_init_fn minit = slib_getoptptr(lib, "sblib_init");
-    if (minit) {
-      if (!minit()) {
-        sc_raise("LIB: %s->sblib_init(), failed", lib->name);
-        success = 0;
-      }
-    }
-
-    // override default name
-    sblib_get_module_name_fn get_module_name = slib_getoptptr(lib, "sblib_get_module_name");
-    if (get_module_name) {
-      strlcpy(lib->name, get_module_name(), NAME_SIZE);
-    }
-  } else {
-    sc_raise("LIB: can't open %s", fullname);
-  }
-  if (success) {
     slib_count++;
     if (!opt_quiet) {
       log_printf("... done\n");
     }
+  } else {
+    sc_raise("LIB: can't open %s", fullname);
   }
 }
 

src/include/module.h

@@ -31,16 +31,7 @@ typedef struct {
  *
  * @return non-zero on success
  */
-int sblib_init(void);
-
-/**
- * @ingroup modlib
- *
- * returns the module name
- *
- * @return module name
- */
-const char *sblib_get_module_name();
+int sblib_init(const char *sourceFile);
 
 /**
  * @ingroup modstd

src/platform/sdl/main.cpp

@@ -40,18 +40,18 @@ const char *FONTS[] = {
 };
 
 static struct option OPTIONS[] = {
-  {"help",      no_argument,       NULL, 'h'},
-  {"verbose",   no_argument,       NULL, 'v'},
-  {"keywords",  no_argument,       NULL, 'k'},
-  {"command",   optional_argument, NULL, 'c'},
-  {"font",      optional_argument, NULL, 'f'},
-  {"run",       optional_argument, NULL, 'r'},
-  {"run-live",  optional_argument, NULL, 'x'},
-  {"run-n-wait",optional_argument, NULL, 'n'},
-  {"module",    optional_argument, NULL, 'm'},
-  {"edit",      optional_argument, NULL, 'e'},
-  {"debug",     optional_argument, NULL, 'd'},
-  {"debugPort", optional_argument, NULL, 'p'},
+  {"help",        no_argument,       NULL, 'h'},
+  {"verbose",     no_argument,       NULL, 'v'},
+  {"keywords",    no_argument,       NULL, 'k'},
+  {"command",     optional_argument, NULL, 'c'},
+  {"font",        optional_argument, NULL, 'f'},
+  {"run",         optional_argument, NULL, 'r'},
+  {"run-live",    optional_argument, NULL, 'x'},
+  {"run-n-wait",  optional_argument, NULL, 'n'},
+  {"module-path", optional_argument, NULL, 'm'},
+  {"edit",        optional_argument, NULL, 'e'},
+  {"debug",       optional_argument, NULL, 'd'},
+  {"debugPort",   optional_argument, NULL, 'p'},
   {0, 0, 0, 0}
 };