elua: move caching into the library

diff --git a/src/Makefile_Elua.am b/src/Makefile_Elua.am
index 65792b6..dd9bf06 100644 (file)
--- a/src/Makefile_Elua.am
+++ b/src/Makefile_Elua.am
@@ -9,7 +9,8 @@ lib/elua/Elua.h
 lib_elua_libelua_la_SOURCES = \
        lib/elua/elua_private.h \
        lib/elua/elua.c \
-       lib/elua/io.c
+       lib/elua/io.c \
+       lib/elua/cache.c
 
 lib_elua_libelua_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
        -DLOCALE_DIR=\"@LOCALE_DIR@\" \
@@ -29,7 +30,6 @@ bin_PROGRAMS += bin/elua/elua
 
 bin_elua_elua_SOURCES = \
        bin/elua/main.h \
-       bin/elua/cache.c \
        bin/elua/main.c
 
 bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \

diff --git a/src/bin/elua/main.c b/src/bin/elua/main.c
index 5ff7487..1eb2a75 100644 (file)
--- a/src/bin/elua/main.c
+++ b/src/bin/elua/main.c
@@ -195,7 +195,7 @@ elua_dolib(lua_State *L, const char *libname)
 static int
 elua_dofile(lua_State *L, const char *fname)
 {
-   return elua_report(L, elua_loadfile(L, fname) || elua_docall(L, 0, 1));
+   return elua_report(L, elua_io_loadfile(L, fname) || elua_docall(L, 0, 1));
 }
 
 static int
@@ -238,14 +238,14 @@ elua_doscript(lua_State *L, int argc, char **argv, int n, int *quit)
         if (f)
           {
              fclose(f);
-             status = elua_loadfile(L, fname);
+             status = elua_io_loadfile(L, fname);
           }
         else
           status = !elua_loadapp(L, fname);
      }
    else
      {
-        status = elua_loadfile(L, fname);
+        status = elua_io_loadfile(L, fname);
      }
    lua_insert(L, -(narg + 1));
    if (!status)
@@ -444,7 +444,7 @@ elua_main(lua_State *L)
           }
      }
    snprintf(modfile, sizeof(modfile), "%s/module.lua", coref);
-   if (elua_report(L, elua_loadfile(L, modfile)))
+   if (elua_report(L, elua_io_loadfile(L, modfile)))
      {
         m->status = 1;
         return 0;
@@ -460,7 +460,7 @@ elua_main(lua_State *L)
    lua_call(L, 2, 0);
 
    snprintf(modfile, sizeof(modfile), "%s/gettext.lua", coref);
-   if (elua_report(L, elua_loadfile(L, modfile)))
+   if (elua_report(L, elua_io_loadfile(L, modfile)))
      {
         m->status = 1;
         return 0;
@@ -468,7 +468,7 @@ elua_main(lua_State *L)
    elua_state_setup_i18n(L);
    lua_call(L, 1, 0);
 
-   elua_register_cache(L);
+   elua_io_register(L);
    lua_gc(L, LUA_GCRESTART, 0);
 
    INF("elua lua state initialized");

diff --git a/src/bin/elua/main.h b/src/bin/elua/main.h
index c66b3d6..29f7a42 100644 (file)
--- a/src/bin/elua/main.h
+++ b/src/bin/elua/main.h
@@ -37,7 +37,4 @@ extern int el_log_domain;
 #define ERR(...) EINA_LOG_DOM_ERR(el_log_domain, __VA_ARGS__)
 #define CRT(...) EINA_LOG_DOM_CRITICAL(el_log_domain, __VA_ARGS__)
 
-int elua_loadfile(lua_State *L, const char *fname);
-void elua_register_cache(lua_State *L);
-
 #endif

diff --git a/src/lib/elua/Elua.h b/src/lib/elua/Elua.h
index bba00e9..80a8a89 100644 (file)
--- a/src/lib/elua/Elua.h
+++ b/src/lib/elua/Elua.h
@@ -64,6 +64,8 @@ EAPI int elua_shutdown(void);
 EAPI void elua_state_setup_i18n(lua_State *L);
 
 EAPI int elua_io_popen(lua_State *L);
+EAPI int elua_io_loadfile(lua_State *L, const char *fname);
+EAPI void elua_io_register(lua_State *L);
 
 #endif
 

diff --git a/src/bin/elua/cache.c b/src/lib/elua/cache.c
similarity index 95%
rename from src/bin/elua/cache.c
rename to src/lib/elua/cache.c
index c71fd04..e272843 100644 (file)
--- a/src/bin/elua/cache.c
+++ b/src/lib/elua/cache.c
@@ -1,6 +1,5 @@
-#include "config.h" 
-
-/* elua bytecode caching */
+#include "Elua.h"
+#include "elua_private.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -8,8 +7,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "main.h"
-
 /* bytecode caching */
 
 static Eina_File *
@@ -152,8 +149,8 @@ getf_map(lua_State *L EINA_UNUSED, void *ud, size_t *size)
    return fmap;
 }
 
-int
-elua_loadfile(lua_State *L, const char *fname)
+EAPI int
+elua_io_loadfile(lua_State *L, const char *fname)
 {
    Map_Stream s;
    int status;
@@ -191,7 +188,7 @@ static int
 loadfile(lua_State *L)
 {
    const char *fname = luaL_optstring(L, 1, NULL);
-   int status = elua_loadfile(L, fname),
+   int status = elua_io_loadfile(L, fname),
        hasenv = (lua_gettop(L) >= 3);
    if (!status)
      {
@@ -207,8 +204,8 @@ loadfile(lua_State *L)
    return 2;
 }
 
-void
-elua_register_cache(lua_State *L)
+EAPI void
+elua_io_register(lua_State *L)
 {
    lua_pushcfunction(L, loadfile);
    lua_setglobal(L, "loadfile");