ffi-efl 0.0.10 → 0.0.11

data/lib/efl/native/eina.rb

@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module Eina
         #
-        FCT_PREFIX = 'eina_'
+        FCT_PREFIX = 'eina_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, █ r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,18 +20,13 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_Version Eina_Version;
         typedef :pointer, :eina_version
-        typedef :pointer, :eina_version_p
-        #
-        # CALLBACKS
         #
         # VARIABLES
         # EAPI extern Eina_Version *eina_version;
-        attach_variable :eina_version, :eina_version_p
+        attach_variable :eina_version, :eina_version
         #
         # FUNCTIONS
         fcts = [
@@ -45,7 +39,7 @@ module Efl
         # EAPI int eina_threads_shutdown(void);
         [ :eina_threads_shutdown, [  ], :int ],
         # EAPI Eina_Bool eina_main_loop_is(void);
-        [ :eina_main_loop_is, [  ], :eina_bool ],
+        [ :eina_main_loop_is, [  ], :bool ],
         # EAPI void eina_main_loop_define(void);
         [ :eina_main_loop_define, [  ], :void ],
         ]

data/lib/efl/native/eina_hash.rb

@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaHash
         #
-        FCT_PREFIX = 'eina_hash_'
+        FCT_PREFIX = 'eina_hash_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, █ r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,91 +20,86 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_Hash Eina_Hash;
         typedef :pointer, :eina_hash
-        typedef :pointer, :eina_hash_p
         # typedef struct _Eina_Hash_Tuple Eina_Hash_Tuple;
         typedef :pointer, :eina_hash_tuple
         #
         # CALLBACKS
         # typedef unsigned int (*Eina_Key_Length) (const void *key);
-        callback :eina_key_length, [ :void_p ], :uint
+        callback :eina_key_length_cb, [ :pointer ], :uint
         # typedef int (*Eina_Key_Cmp) (const void *key1, int key1_length, const void *key2, int key2_length);
-        callback :eina_key_cmp, [ :void_p, :int, :void_p, :int ], :int
+        callback :eina_key_cmp_cb, [ :pointer, :int, :pointer, :int ], :int
         # typedef int (*Eina_Key_Hash) (const void *key, int key_length);
-        callback :eina_key_hash, [ :void_p, :int ], :int
+        callback :eina_key_hash_cb, [ :pointer, :int ], :int
         # typedef Eina_Bool (*Eina_Hash_Foreach) (const Eina_Hash *hash, const void *key, void *data, void *fdata);
-        callback :eina_hash_foreach, [ :eina_hash_p, :void_p, :void_p, :void_p ], :eina_bool
-        #
-        # VARIABLES
+        callback :eina_hash_foreach_cb, [ :eina_hash, :pointer, :pointer, :pointer ], :bool
         #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_Hash *eina_hash_new(Eina_Key_Length key_length_cb, Eina_Key_Cmp key_cmp_cb, Eina_Key_Hash key_hash_cb, Eina_Free_Cb data_free_cb, int buckets_power_size);
-        [ :eina_hash_new, [ :eina_key_length, :eina_key_cmp, :eina_key_hash, :eina_free_cb, :int ], :eina_hash_p ],
+        [ :eina_hash_new, [ :eina_key_length_cb, :eina_key_cmp_cb, :eina_key_hash_cb, :eina_free_cb, :int ], :eina_hash ],
         # EAPI void eina_hash_free_cb_set(Eina_Hash *hash, Eina_Free_Cb data_free_cb);
-        [ :eina_hash_free_cb_set, [ :eina_hash_p, :eina_free_cb ], :void ],
+        [ :eina_hash_free_cb_set, [ :eina_hash, :eina_free_cb ], :void ],
         # EAPI Eina_Hash *eina_hash_string_djb2_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_djb2_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_djb2_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_string_superfast_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_superfast_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_superfast_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_string_small_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_string_small_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_string_small_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_int32_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_int32_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_int32_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_int64_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_int64_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_int64_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_pointer_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_pointer_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_pointer_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Hash *eina_hash_stringshared_new(Eina_Free_Cb data_free_cb);
-        [ :eina_hash_stringshared_new, [ :eina_free_cb ], :eina_hash_p ],
+        [ :eina_hash_stringshared_new, [ :eina_free_cb ], :eina_hash ],
         # EAPI Eina_Bool eina_hash_add(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_add, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_add, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_direct_add(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_direct_add, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_direct_add, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_del, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI void *eina_hash_find(const Eina_Hash *hash, const void *key);
-        [ :eina_hash_find, [ :eina_hash_p, :void_p ], :void_p ],
+        [ :eina_hash_find, [ :eina_hash, :pointer ], :pointer ],
         # EAPI void *eina_hash_modify(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_modify, [ :eina_hash_p, :void_p, :void_p ], :void_p ],
+        [ :eina_hash_modify, [ :eina_hash, :pointer, :pointer ], :pointer ],
         # EAPI void *eina_hash_set(Eina_Hash *hash, const void *key, const void *data);
-        [ :eina_hash_set, [ :eina_hash_p, :void_p, :void_p ], :void_p ],
+        [ :eina_hash_set, [ :eina_hash, :pointer, :pointer ], :pointer ],
         # EAPI Eina_Bool eina_hash_move(Eina_Hash *hash, const void *old_key, const void *new_key);
-        [ :eina_hash_move, [ :eina_hash_p, :void_p, :void_p ], :eina_bool ],
+        [ :eina_hash_move, [ :eina_hash, :pointer, :pointer ], :bool ],
         # EAPI void eina_hash_free(Eina_Hash *hash);
-        [ :eina_hash_free, [ :eina_hash_p ], :void ],
+        [ :eina_hash_free, [ :eina_hash ], :void ],
         # EAPI void eina_hash_free_buckets(Eina_Hash *hash);
-        [ :eina_hash_free_buckets, [ :eina_hash_p ], :void ],
+        [ :eina_hash_free_buckets, [ :eina_hash ], :void ],
         # EAPI int eina_hash_population(const Eina_Hash *hash);
-        [ :eina_hash_population, [ :eina_hash_p ], :int ],
+        [ :eina_hash_population, [ :eina_hash ], :int ],
         # EAPI Eina_Bool eina_hash_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_add_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_add_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_direct_add_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_direct_add_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_direct_add_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_key_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash);
-        [ :eina_hash_del_by_key_hash, [ :eina_hash_p, :void_p, :int, :int ], :eina_bool ],
+        [ :eina_hash_del_by_key_hash, [ :eina_hash, :pointer, :int, :int ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_key(Eina_Hash *hash, const void *key);
-        [ :eina_hash_del_by_key, [ :eina_hash_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_key, [ :eina_hash, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_data(Eina_Hash *hash, const void *data);
-        [ :eina_hash_del_by_data, [ :eina_hash_p, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_data, [ :eina_hash, :pointer ], :bool ],
         # EAPI Eina_Bool eina_hash_del_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_del_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :eina_bool ],
+        [ :eina_hash_del_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :bool ],
         # EAPI void *eina_hash_find_by_hash(const Eina_Hash *hash, const void *key, int key_length, int key_hash);
-        [ :eina_hash_find_by_hash, [ :eina_hash_p, :void_p, :int, :int ], :void_p ],
+        [ :eina_hash_find_by_hash, [ :eina_hash, :pointer, :int, :int ], :pointer ],
         # EAPI void *eina_hash_modify_by_hash(Eina_Hash *hash, const void *key, int key_length, int key_hash, const void *data);
-        [ :eina_hash_modify_by_hash, [ :eina_hash_p, :void_p, :int, :int, :void_p ], :void_p ],
+        [ :eina_hash_modify_by_hash, [ :eina_hash, :pointer, :int, :int, :pointer ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_key_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_key_new, [ :eina_hash_p ], :eina_iterator_p ],
+        [ :eina_hash_iterator_key_new, [ :eina_hash ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_data_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_data_new, [ :eina_hash_p ], :eina_iterator_p ],
+        [ :eina_hash_iterator_data_new, [ :eina_hash ], :pointer ],
         # EAPI Eina_Iterator *eina_hash_iterator_tuple_new(const Eina_Hash *hash);
-        [ :eina_hash_iterator_tuple_new, [ :eina_hash_p ], :eina_iterator_p ],
-        # EAPI void eina_hash_foreach(const Eina_Hash *hash, Eina_Hash_Foreach cb, const void *fdata);
-        [ :eina_hash_foreach, [ :eina_hash_p, :eina_hash_foreach, :void_p ], :void ],
+        [ :eina_hash_iterator_tuple_new, [ :eina_hash ], :pointer ],
+        # EAPI void eina_hash_foreach(const Eina_Hash *hash, Eina_Hash_Foreach func, const void *fdata);
+        [ :eina_hash_foreach, [ :eina_hash, :eina_hash_foreach_cb, :pointer ], :void ],
         # EAPI int eina_hash_superfast(const char *key, int len);
         [ :eina_hash_superfast, [ :string, :int ], :int ],
         ]

data/lib/efl/native/eina_list.rb

@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaList
         #
-        FCT_PREFIX = 'eina_list_'
+        FCT_PREFIX = 'eina_list_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, █ r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -21,88 +20,80 @@ module Efl
         #
         ffi_lib 'eina'
         #
-        # ENUMS
-        #
         # TYPEDEFS
         # typedef struct _Eina_List Eina_List;
         typedef :pointer, :eina_list
-        typedef :pointer, :eina_list_p
-        typedef :pointer, :eina_list_pp
         # typedef struct _Eina_List_Accounting Eina_List_Accounting;
         typedef :pointer, :eina_list_accounting
         #
-        # CALLBACKS
-        #
-        # VARIABLES
-        #
         # FUNCTIONS
         fcts = [
         # EAPI Eina_List *eina_list_append(Eina_List *list, const void *data);
-        [ :eina_list_append, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_append, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend(Eina_List *list, const void *data);
-        [ :eina_list_prepend, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_prepend, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_append_relative(Eina_List *list, const void *data, const void *relative);
-        [ :eina_list_append_relative, [ :eina_list_p, :void_p, :void_p ], :eina_list_p ],
+        [ :eina_list_append_relative, [ :eina_list, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_append_relative_list(Eina_List *list, const void *data, Eina_List *relative);
-        [ :eina_list_append_relative_list, [ :eina_list_p, :void_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_append_relative_list, [ :eina_list, :pointer, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend_relative(Eina_List *list, const void *data, const void *relative);
-        [ :eina_list_prepend_relative, [ :eina_list_p, :void_p, :void_p ], :eina_list_p ],
+        [ :eina_list_prepend_relative, [ :eina_list, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_prepend_relative_list(Eina_List *list, const void *data, Eina_List *relative);
-        [ :eina_list_prepend_relative_list, [ :eina_list_p, :void_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_prepend_relative_list, [ :eina_list, :pointer, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_sorted_insert(Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_sorted_insert, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_sorted_insert, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_remove(Eina_List *list, const void *data);
-        [ :eina_list_remove, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_remove, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_remove_list(Eina_List *list, Eina_List *remove_list);
-        [ :eina_list_remove_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_remove_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_promote_list(Eina_List *list, Eina_List *move_list);
-        [ :eina_list_promote_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_promote_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_demote_list(Eina_List *list, Eina_List *move_list);
-        [ :eina_list_demote_list, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_demote_list, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI void *eina_list_data_find(const Eina_List *list, const void *data);
-        [ :eina_list_data_find, [ :eina_list_p, :void_p ], :void_p ],
+        [ :eina_list_data_find, [ :eina_list, :pointer ], :pointer ],
         # EAPI Eina_List *eina_list_data_find_list(const Eina_List *list, const void *data);
-        [ :eina_list_data_find_list, [ :eina_list_p, :void_p ], :eina_list_p ],
+        [ :eina_list_data_find_list, [ :eina_list, :pointer ], :eina_list ],
         # EAPI Eina_Bool eina_list_move(Eina_List **to, Eina_List **from, void *data);
-        [ :eina_list_move, [ :eina_list_pp, :eina_list_pp, :void_p ], :eina_bool ],
+        [ :eina_list_move, [ :eina_list, :eina_list, :pointer ], :bool ],
         # EAPI Eina_Bool eina_list_move_list(Eina_List **to, Eina_List **from, Eina_List *data);
-        [ :eina_list_move_list, [ :eina_list_pp, :eina_list_pp, :eina_list_p ], :eina_bool ],
+        [ :eina_list_move_list, [ :eina_list, :eina_list, :eina_list ], :bool ],
         # EAPI Eina_List *eina_list_free(Eina_List *list);
-        [ :eina_list_free, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_free, [ :eina_list ], :eina_list ],
         # EAPI void *eina_list_nth(const Eina_List *list, unsigned int n);
-        [ :eina_list_nth, [ :eina_list_p, :uint ], :void_p ],
+        [ :eina_list_nth, [ :eina_list, :uint ], :pointer ],
         # EAPI Eina_List *eina_list_nth_list(const Eina_List *list, unsigned int n);
-        [ :eina_list_nth_list, [ :eina_list_p, :uint ], :eina_list_p ],
+        [ :eina_list_nth_list, [ :eina_list, :uint ], :eina_list ],
         # EAPI Eina_List *eina_list_reverse(Eina_List *list);
-        [ :eina_list_reverse, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_reverse, [ :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_reverse_clone(const Eina_List *list);
-        [ :eina_list_reverse_clone, [ :eina_list_p ], :eina_list_p ],
+        [ :eina_list_reverse_clone, [ :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_clone(const Eina_List *list);
-        [ :eina_list_clone, [ :eina_list_p ], :eina_list_p ],
-        # EAPI Eina_List *eina_list_sort(Eina_List *list, unsigned int size, Eina_Compare_Cb func);
-        [ :eina_list_sort, [ :eina_list_p, :uint, :eina_compare_cb ], :eina_list_p ],
+        [ :eina_list_clone, [ :eina_list ], :eina_list ],
+        # EAPI Eina_List *eina_list_sort(Eina_List *list, unsigned int limit, Eina_Compare_Cb func);
+        [ :eina_list_sort, [ :eina_list, :uint, :eina_compare_cb ], :eina_list ],
         # EAPI Eina_List *eina_list_merge(Eina_List *left, Eina_List *right);
-        [ :eina_list_merge, [ :eina_list_p, :eina_list_p ], :eina_list_p ],
+        [ :eina_list_merge, [ :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_sorted_merge(Eina_List *left, Eina_List *right, Eina_Compare_Cb func);
-        [ :eina_list_sorted_merge, [ :eina_list_p, :eina_list_p, :eina_compare_cb ], :eina_list_p ],
+        [ :eina_list_sorted_merge, [ :eina_list, :eina_list, :eina_compare_cb ], :eina_list ],
         # EAPI Eina_List *eina_list_split_list(Eina_List *list, Eina_List *relative, Eina_List **right);
-        [ :eina_list_split_list, [ :eina_list_p, :eina_list_p, :eina_list_pp ], :eina_list_p ],
+        [ :eina_list_split_list, [ :eina_list, :eina_list, :eina_list ], :eina_list ],
         # EAPI Eina_List *eina_list_search_sorted_near_list(const Eina_List *list, Eina_Compare_Cb func, const void *data, int *result_cmp);
-        [ :eina_list_search_sorted_near_list, [ :eina_list_p, :eina_compare_cb, :void_p, :int_p ], :eina_list_p ],
+        [ :eina_list_search_sorted_near_list, [ :eina_list, :eina_compare_cb, :pointer, :pointer ], :eina_list ],
         # EAPI Eina_List *eina_list_search_sorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_sorted_list, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_search_sorted_list, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI void *eina_list_search_sorted(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_sorted, [ :eina_list_p, :eina_compare_cb, :void_p ], :void_p ],
+        [ :eina_list_search_sorted, [ :eina_list, :eina_compare_cb, :pointer ], :pointer ],
         # EAPI Eina_List *eina_list_search_unsorted_list(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_unsorted_list, [ :eina_list_p, :eina_compare_cb, :void_p ], :eina_list_p ],
+        [ :eina_list_search_unsorted_list, [ :eina_list, :eina_compare_cb, :pointer ], :eina_list ],
         # EAPI void *eina_list_search_unsorted(const Eina_List *list, Eina_Compare_Cb func, const void *data);
-        [ :eina_list_search_unsorted, [ :eina_list_p, :eina_compare_cb, :void_p ], :void_p ],
+        [ :eina_list_search_unsorted, [ :eina_list, :eina_compare_cb, :pointer ], :pointer ],
         # EAPI Eina_Iterator *eina_list_iterator_new(const Eina_List *list);
-        [ :eina_list_iterator_new, [ :eina_list_p ], :eina_iterator_p ],
+        [ :eina_list_iterator_new, [ :eina_list ], :pointer ],
         # EAPI Eina_Iterator *eina_list_iterator_reversed_new(const Eina_List *list);
-        [ :eina_list_iterator_reversed_new, [ :eina_list_p ], :eina_iterator_p ],
+        [ :eina_list_iterator_reversed_new, [ :eina_list ], :pointer ],
         # EAPI Eina_Accessor *eina_list_accessor_new(const Eina_List *list);
-        [ :eina_list_accessor_new, [ :eina_list_p ], :eina_accessor_p ],
+        [ :eina_list_accessor_new, [ :eina_list ], :pointer ],
         ]
         #
         attach_fcts fcts

data/lib/efl/native/eina_log.rb

@@ -1,18 +1,17 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
 #
 module Efl
     #
     module EinaLog
         #
-        FCT_PREFIX = 'eina_log_'
+        FCT_PREFIX = 'eina_log_' unless const_defined? :FCT_PREFIX
         #
-        def self.method_missing m, *args, &block
-            sym, args_s = ModuleHelper.find_function m, FCT_PREFIX
-            self.module_eval "def self.#{m} *args, █ r=Efl::Native.#{sym}(#{args_s}); yield r if block_given?; r; end"
-            self.send m, *args, &block
+        def self.method_missing meth, *args, &block
+            sym = Efl::MethodResolver.resolve self, meth, FCT_PREFIX
+            self.send sym, *args, &block
         end
         #
     end
@@ -23,17 +22,16 @@ module Efl
         #
         # ENUMS
         # typedef enum _Eina_Log_Level {...} Eina_Log_Level;
-        enum :eina_log_level, [ :eina_log_level_critical, :eina_log_level_err, :eina_log_level_warn, :eina_log_level_info, :eina_log_level_dbg, :eina_log_levels,
-            :eina_log_level_unknown ]
+        enum :eina_log_level, [ :eina_log_level_critical, 0, :eina_log_level_err, 1, :eina_log_level_warn, 2, :eina_log_level_info, 3,
+            :eina_log_level_dbg, 4, :eina_log_levels, 5, :eina_log_level_unknown, (-2147483647-1) ]
         #
         # TYPEDEFS
         # typedef struct _Eina_Log_Domain Eina_Log_Domain;
         typedef :pointer, :eina_log_domain
-        typedef :pointer, :eina_log_domain_p
         #
         # CALLBACKS
         # typedef void (*Eina_Log_Print_Cb) (const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        callback :eina_log_print_cb, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void
+        callback :eina_log_print_cb, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void
         #
         # VARIABLES
         # EAPI extern int EINA_LOG_DOMAIN_GLOBAL;
@@ -44,29 +42,29 @@ module Efl
         # EAPI void eina_log_threads_enable(void);
         [ :eina_log_threads_enable, [  ], :void ],
         # EAPI void eina_log_print_cb_set(Eina_Log_Print_Cb cb, void *data);
-        [ :eina_log_print_cb_set, [ :eina_log_print_cb, :void_p ], :void ],
+        [ :eina_log_print_cb_set, [ :eina_log_print_cb, :pointer ], :void ],
         # EAPI void eina_log_level_set(int level);
         [ :eina_log_level_set, [ :int ], :void ],
         # EAPI int eina_log_level_get(void);
         [ :eina_log_level_get, [  ], :int ],
         # EAPI Eina_Bool eina_log_main_thread_check(void);
-        [ :eina_log_main_thread_check, [  ], :eina_bool ],
+        [ :eina_log_main_thread_check, [  ], :bool ],
         # EAPI void eina_log_color_disable_set(Eina_Bool disabled);
-        [ :eina_log_color_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_color_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_color_disable_get(void);
-        [ :eina_log_color_disable_get, [  ], :eina_bool ],
+        [ :eina_log_color_disable_get, [  ], :bool ],
         # EAPI void eina_log_file_disable_set(Eina_Bool disabled);
-        [ :eina_log_file_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_file_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_file_disable_get(void);
-        [ :eina_log_file_disable_get, [  ], :eina_bool ],
+        [ :eina_log_file_disable_get, [  ], :bool ],
         # EAPI void eina_log_function_disable_set(Eina_Bool disabled);
-        [ :eina_log_function_disable_set, [ :eina_bool ], :void ],
+        [ :eina_log_function_disable_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_function_disable_get(void);
-        [ :eina_log_function_disable_get, [  ], :eina_bool ],
+        [ :eina_log_function_disable_get, [  ], :bool ],
         # EAPI void eina_log_abort_on_critical_set(Eina_Bool abort_on_critical);
-        [ :eina_log_abort_on_critical_set, [ :eina_bool ], :void ],
+        [ :eina_log_abort_on_critical_set, [ :bool ], :void ],
         # EAPI Eina_Bool eina_log_abort_on_critical_get(void);
-        [ :eina_log_abort_on_critical_get, [  ], :eina_bool ],
+        [ :eina_log_abort_on_critical_get, [  ], :bool ],
         # EAPI void eina_log_abort_on_critical_level_set(int critical_level);
         [ :eina_log_abort_on_critical_level_set, [ :int ], :void ],
         # EAPI int eina_log_abort_on_critical_level_get(void);
@@ -86,11 +84,11 @@ module Efl
         # EAPI void eina_log_vprint(int domain, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, va_list args);
         [ :eina_log_vprint, [ :int, :eina_log_level, :string, :string, :int, :string, :pointer ], :void ],
         # EAPI void eina_log_print_cb_stdout(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_stdout, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_stdout, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         # EAPI void eina_log_print_cb_stderr(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_stderr, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_stderr, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         # EAPI void eina_log_print_cb_file(const Eina_Log_Domain *d, Eina_Log_Level level, const char *file, const char *fnc, int line, const char *fmt, void *data, va_list args);
-        [ :eina_log_print_cb_file, [ :eina_log_domain_p, :eina_log_level, :string, :string, :int, :string, :void_p, :pointer ], :void ],
+        [ :eina_log_print_cb_file, [ :eina_log_domain, :eina_log_level, :string, :string, :int, :string, :pointer, :pointer ], :void ],
         ]
         #
         attach_fcts fcts