diff options
author | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2018-03-02 13:43:16 +0100 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2018-03-02 13:43:16 +0100 |
commit | 5701ce22a3fc583de352eea63388141b708169ee (patch) | |
tree | fe0d85d951912467669043b1c7a72fb1e1a727f3 | |
parent | e27336cee1ca95bce35482f6c5d68af850326676 (diff) | |
download | efl-5701ce22a3fc583de352eea63388141b708169ee.tar.gz |
elua: remove old dir scan/parse APIs
-rw-r--r-- | src/bindings/luajit/eolian.lua | 19 | ||||
-rw-r--r-- | src/scripts/elua/apps/docgen/doctree.lua | 4 | ||||
-rw-r--r-- | src/scripts/elua/apps/lualian.lua | 2 | ||||
-rw-r--r-- | src/scripts/elua/modules/lualian.lua | 6 |
4 files changed, 13 insertions, 18 deletions
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua index 5c304103fa..56b24d59d7 100644 --- a/src/bindings/luajit/eolian.lua +++ b/src/bindings/luajit/eolian.lua @@ -333,15 +333,10 @@ ffi.cdef [[ Eina_Iterator *eolian_unit_structs_get(const Eolian_Unit *unit); Eina_Iterator *eolian_unit_enums_get(const Eolian_Unit *unit); - const Eolian_Unit *eolian_file_parse(Eolian_State *state, const char *filepath); Eina_Iterator *eolian_all_eo_file_paths_get(Eolian_State *state); Eina_Iterator *eolian_all_eot_file_paths_get(Eolian_State *state); Eina_Iterator *eolian_all_eo_files_get(Eolian_State *state); Eina_Iterator *eolian_all_eot_files_get(Eolian_State *state); - Eina_Bool eolian_directory_scan(Eolian_State *state, const char *dir); - Eina_Bool eolian_system_directory_scan(Eolian_State *state); - Eina_Bool eolian_all_eo_files_parse(Eolian_State *state); - Eina_Bool eolian_all_eot_files_parse(Eolian_State *state); const Eolian_Class *eolian_class_get_by_name(const Eolian_Unit *unit, const char *class_name); const Eolian_Class *eolian_class_get_by_file(const Eolian_Unit *unit, const char *file_name); const char *eolian_class_file_get(const Eolian_Class *klass); @@ -558,16 +553,16 @@ M.object_scope = { ffi.metatype("Eolian_State", { __index = { - directory_scan = function(self, dir) - return eolian.eolian_directory_scan(self, dir) ~= 0 + directory_add = function(self, dir) + return eolian.eolian_state_directory_add(self, dir) ~= 0 end, - system_directory_scan = function(self) - return eolian.eolian_system_directory_scan(self) ~= 0 + system_directory_add = function(self) + return eolian.eolian_state_system_directory_add(self) ~= 0 end, file_parse = function(self, fpath) - local v = eolian.eolian_file_parse(self, fpath) + local v = eolian.eolian_state_file_parse(self, fpath) if v == nil then return nil end @@ -575,11 +570,11 @@ ffi.metatype("Eolian_State", { end, all_eo_files_parse = function(self) - return eolian.eolian_all_eo_files_parse(self) ~= 0 + return eolian.eolian_state_all_eo_files_parse(self) ~= 0 end, all_eot_files_parse = function(self) - return eolian.eolian_all_eot_files_parse(self) ~= 0 + return eolian.eolian_state_all_eot_files_parse(self) ~= 0 end, all_eo_file_paths_get = function(self) diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua index 2e96d4f794..4e1f906d88 100644 --- a/src/scripts/elua/apps/docgen/doctree.lua +++ b/src/scripts/elua/apps/docgen/doctree.lua @@ -1516,12 +1516,12 @@ M.DocTokenizer = Node:clone { M.scan_directory = function(dir) if not dir then - if not eos:system_directory_scan() then + if not eos:system_directory_add() then error("failed scanning system directory") end return end - if not eos:directory_scan(dir) then + if not eos:directory_add(dir) then error("failed scanning directory: " .. dir) end end diff --git a/src/scripts/elua/apps/lualian.lua b/src/scripts/elua/apps/lualian.lua index 4ffbf58ee1..f0837d7e35 100644 --- a/src/scripts/elua/apps/lualian.lua +++ b/src/scripts/elua/apps/lualian.lua @@ -52,7 +52,7 @@ getopt.parse { lualian.include_dir(v) end if os.getenv("EFL_RUN_IN_TREE") then - lualian.system_directory_scan() + lualian.system_directory_add() end lualian.load_eot_files() for i, fname in ipairs(args) do diff --git a/src/scripts/elua/modules/lualian.lua b/src/scripts/elua/modules/lualian.lua index 3864bd1d02..56f3ad3a50 100644 --- a/src/scripts/elua/modules/lualian.lua +++ b/src/scripts/elua/modules/lualian.lua @@ -691,7 +691,7 @@ local gen_class = function(klass) end M.include_dir = function(dir) - if not get_state():directory_scan(dir) then + if not get_state():directory_add(dir) then error("Failed including directory: " .. dir) end end @@ -700,8 +700,8 @@ M.load_eot_files = function() return get_state():all_eot_files_parse() end -M.system_directory_scan = function() - return get_state():system_directory_scan() +M.system_directory_add = function() + return get_state():system_directory_add() end M.generate = function(fname, fstream) |