From ac22afec8a05c899089f69f70a63873f66891546 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Tue, 24 Jun 2014 13:56:41 +0100 Subject: [PATCH] elua: update lualian against latest changes --- src/bin/elua/apps/lualian.lua | 1 + src/bin/elua/modules/lualian.lua | 4 ++++ src/bindings/luajit/eolian.lua | 10 ++++++++++ 3 files changed, 15 insertions(+) diff --git a/src/bin/elua/apps/lualian.lua b/src/bin/elua/apps/lualian.lua index 7f46d1607c..3419b74f99 100644 --- a/src/bin/elua/apps/lualian.lua +++ b/src/bin/elua/apps/lualian.lua @@ -57,6 +57,7 @@ getopt.parse { for i, v in ipairs(opts["I"] or {}) do lualian.include_dir(v) end + lualian.load_eot_files() for i, fname in ipairs(args) do gen_file(opts, i, fname) end diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua index 73b1067db1..311e5c05be 100644 --- a/src/bin/elua/modules/lualian.lua +++ b/src/bin/elua/modules/lualian.lua @@ -691,6 +691,10 @@ M.include_dir = function(dir) end end +M.load_eot_files = function() + return eolian.all_eot_files_parse() +end + M.generate = function(fname, modname, libname, fstream) if not eolian.eo_file_parse(fname) then error("Failed parsing file: " .. fname) diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 661a13400c..01d7f99a49 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -47,10 +47,12 @@ ffi.cdef [[ } Eolian_Function_Scope; Eina_Bool eolian_eo_file_parse(const char *filename); + Eina_Bool eolian_eot_file_parse(const char *filepath); int eolian_init(void); int eolian_shutdown(void); Eina_Bool eolian_directory_scan(const char *dir); Eina_Bool eolian_all_eo_files_parse(); + Eina_Bool eolian_all_eot_files_parse(); Eina_Bool eolian_show(const Eolian_Class *klass); Eolian_Class *eolian_class_find_by_name(const char *class_name); Eolian_Class *eolian_class_find_by_file(const char *file_name); @@ -134,6 +136,14 @@ M.eo_file_parse = function(fname) return eolian.eolian_eo_file_parse(fname) ~= 0 end +M.all_eot_files_parse = function() + return eolian.eolian_all_eot_files_parse() ~= 0 +end + +M.eot_file_parse = function(fname) + return eolian.eolian_eot_file_parse(fname) ~= 0 +end + M.show = function(klass) return eolian.eolian_show(klass) ~= 0 end