rename

git-svn-id: file:///raid/svn-main/nishi-serenade/trunk@72 0f02c867-ac3d-714e-8a88-971ba1f6efcf

diff --git a/Serenade/binmodule.c b/Serenade/binmodule.c
index bfdea907144e4a6425ba51177a0eb2ad4234f92b..49423d9118d1e4462ae843f1176efd543828a273 100644 (file)
--- a/Serenade/binmodule.c
+++ b/Serenade/binmodule.c
@@ -29,3 +29,6 @@
 /* --- END LICENSE --- */
 
 #include "binmodule.h"
+
+void binmodule_init(struct sn_interpreter* sn){
+}

diff --git a/Serenade/binmodule.h b/Serenade/binmodule.h
index 31bbdbffa53d7b58ac2a9a513043b9afaddc8c11..41c0b4af4546a6f4fcb2fb7b9829875bcdb17f0d 100644 (file)
--- a/Serenade/binmodule.h
+++ b/Serenade/binmodule.h
@@ -33,6 +33,6 @@
 
 #include "interpreter.h"
 
-void ffi_init(struct sn_interpreter* sn);
+void binmodule_init(struct sn_interpreter* sn);
 
 #endif

diff --git a/Serenade/interpreter.c b/Serenade/interpreter.c
index 993d808494d621f991b85aba025c9f3a9777cfb0..1b22c0033e6a5aa297afd587cb24e52325dbfd93 100644 (file)
--- a/Serenade/interpreter.c
+++ b/Serenade/interpreter.c
@@ -31,6 +31,7 @@
 #include "interpreter.h"
 
 #include "../config.h"
+
 #include "run.h"
 #include "util.h"
 
@@ -156,10 +157,13 @@ void sn_stdlib_init(struct sn_interpreter* sn) {
        sn_set_handler(sn, "source", source_handler);
 }
 
-void sn_ffi_init(struct sn_interpreter* sn) {
+void sn_module_init(struct sn_interpreter* sn) {
 #ifdef HAS_FFI_SUPPORT
        ffi_init(sn);
 #endif
+#ifdef HAS_BINMODULE_SUPPORT
+       binmodule_init(sn);
+#endif
 }
 
 struct sn_interpreter* sn_create_interpreter(void) {

diff --git a/Serenade/interpreter.h b/Serenade/interpreter.h
index fc7c73c354799f6c9bda972e3a02ec6a9042c25d..8e4b552b9d0c85f203933d4a613a2f0b1bef7cb9 100644 (file)
--- a/Serenade/interpreter.h
+++ b/Serenade/interpreter.h
@@ -52,6 +52,6 @@ struct sn_interpreter_kv* sn_set_variable(struct sn_interpreter* sn, const char*
 struct sn_interpreter_kv* sn_set_handler(struct sn_interpreter* sn, const char* name, struct sn_generic* (*handler)(struct sn_interpreter* sn, int, struct sn_generic**));
 int sn_eval(struct sn_interpreter* sn, char* data, unsigned long long len);
 void sn_stdlib_init(struct sn_interpreter* sn);
-void sn_ffi_init(struct sn_interpreter* sn);
+void sn_module_init(struct sn_interpreter* sn);
 
 #endif

diff --git a/Serenade/main.c b/Serenade/main.c
index e6227af2324322b8bff65cbbc9ddcd098923e0ed..657dcd16323bbeb9846f006c06996fbaee736a56 100644 (file)
--- a/Serenade/main.c
+++ b/Serenade/main.c
@@ -86,7 +86,7 @@ int main(int argc, char** argv) {
                                fread(str, 1, s.st_size, f);
                                struct sn_interpreter* sn = sn_create_interpreter();
                                sn_stdlib_init(sn);
-                               sn_ffi_init(sn);
+                               sn_module_init(sn);
                                int r = sn_eval(sn, str, s.st_size);
                                sn_interpreter_free(sn);
                                free(str);
@@ -116,7 +116,7 @@ int main(int argc, char** argv) {
                printf("Parser stack size: %d\n", PARSER_STACK_SIZE);
                struct sn_interpreter* sn = sn_create_interpreter();
                sn_stdlib_init(sn);
-               sn_ffi_init(sn);
+               sn_module_init(sn);
                char cbuf[2];
                cbuf[0] = '\n';
                cbuf[1] = 0;

diff --git a/Tool/configgen.c b/Tool/configgen.c
index b7971e21708a185651e5772e3d1ee9127a0e7bd9..e12ff97b3f7a639ec1f521461d1a54a111ed5228 100644 (file)
--- a/Tool/configgen.c
+++ b/Tool/configgen.c
@@ -47,6 +47,9 @@ void macro_print(FILE* out) {
        fprintf(out, "#ifdef HAS_FFI_SUPPORT\n");
        fprintf(out, "#include \"Serenade/ffi_binding.h\"\n");
        fprintf(out, "#endif\n");
+       fprintf(out, "#ifdef HAS_BINMODULE_SUPPORT\n");
+       fprintf(out, "#include \"Serenade/binmodule.h\"\n");
+       fprintf(out, "#endif\n");
        fprintf(out, "#endif\n");
 }