Merge branch 'wip'

Conflicts:
	tools/genruby.rb

1 files changed, 28 insertions, 34 deletions

diff --git a/lib/efl/native/emap.rb b/lib/efl/native/emap.rb
index 6fb4fdb..0f31d7c 100644
--- a/lib/efl/native/emap.rb
+++ b/lib/efl/native/emap.rb
@@ -1,18 +1,18 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi'
+require 'efl/native'
+require 'efl/native/eina_list'
 #
 module Efl
     #
-    module EMap
+    module Emap
         #
-        FCT_PREFIX = 'emap_'
+        FCT_PREFIX = 'emap_' 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
@@ -28,59 +28,53 @@ module Efl
         # TYPEDEFS
         # typedef struct emap_route EMap_Route;
         typedef :pointer, :emap_route
-        typedef :pointer, :emap_route_p
         # typedef struct emap_route_node EMap_Route_Node;
         typedef :pointer, :emap_route_node
-        typedef :pointer, :emap_route_node_p
-        #
-        # CALLBACKS
-        #
-        # VARIABLES
         #
         # FUNCTIONS
         fcts = [
         # EAPI int emap_init();
-        [ :emap_init, [ ], :int ],
+        [ :emap_init, [  ], :int ],
         # EAPI int emap_shutdown();
-        [ :emap_shutdown, [ ], :int ],
+        [ :emap_shutdown, [  ], :int ],
         # EAPI EMap_Route *emap_route_new();
-        [ :emap_route_new, [ ], :emap_route_p ],
+        [ :emap_route_new, [  ], :emap_route ],
         # EAPI void emap_route_node_add(EMap_Route *route, EMap_Route_Node *node);
-        [ :emap_route_node_add, [ :emap_route_p, :emap_route_node_p ], :void ],
+        [ :emap_route_node_add, [ :emap_route, :emap_route_node ], :void ],
         # EAPI void emap_route_free(EMap_Route *route);
-        [ :emap_route_free, [ :emap_route_p ], :void ],
+        [ :emap_route_free, [ :emap_route ], :void ],
         # EAPI void emap_route_name_set(EMap_Route *route, const char *name);
-        [ :emap_route_name_set, [ :emap_route_p, :string ], :void ],
+        [ :emap_route_name_set, [ :emap_route, :string ], :void ],
         # EAPI const char *emap_route_name_get(EMap_Route *route);
-        [ :emap_route_name_get, [ :emap_route_p ], :string ],
+        [ :emap_route_name_get, [ :emap_route ], :string ],
         # EAPI Eina_List *emap_route_nodes_get(EMap_Route *route);
-        [ :emap_route_nodes_get, [ :emap_route_p ], :eina_list_p ],
+        [ :emap_route_nodes_get, [ :emap_route ], :eina_list ],
         # EAPI double emap_route_distance_get(EMap_Route *route);
-        [ :emap_route_distance_get, [ :emap_route_p ], :double ],
+        [ :emap_route_distance_get, [ :emap_route ], :double ],
         # EAPI EMap_Route_Node *emap_route_node_new();
-        [ :emap_route_node_new, [ ], :emap_route_node_p ],
+        [ :emap_route_node_new, [  ], :emap_route_node ],
         # EAPI void emap_route_node_lon_set(EMap_Route_Node *node, double lon);
-        [ :emap_route_node_lon_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_lon_set, [ :emap_route_node, :double ], :void ],
         # EAPI void emap_route_node_lat_set(EMap_Route_Node *node, double lat);
-        [ :emap_route_node_lat_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_lat_set, [ :emap_route_node, :double ], :void ],
         # EAPI double emap_route_node_lon_get(EMap_Route_Node *node);
-        [ :emap_route_node_lon_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_lon_get, [ :emap_route_node ], :double ],
         # EAPI double emap_route_node_lat_get(EMap_Route_Node *node);
-        [ :emap_route_node_lat_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_lat_get, [ :emap_route_node ], :double ],
         # EAPI void emap_route_node_elevation_set(EMap_Route_Node *node, double elevation);
-        [ :emap_route_node_elevation_set, [ :emap_route_node_p, :double ], :void ],
+        [ :emap_route_node_elevation_set, [ :emap_route_node, :double ], :void ],
         # EAPI double emap_route_node_elevation_get(EMap_Route_Node *node);
-        [ :emap_route_node_elevation_get, [ :emap_route_node_p ], :double ],
+        [ :emap_route_node_elevation_get, [ :emap_route_node ], :double ],
         # EAPI void emap_route_node_time_set(EMap_Route_Node *node, time_t time);
-        [ :emap_route_node_time_set, [ :emap_route_node_p, :ulong ], :void ],
+        [ :emap_route_node_time_set, [ :emap_route_node, :ulong ], :void ],
         # EAPI time_t emap_route_node_time_get(EMap_Route_Node *node);
-        [ :emap_route_node_time_get, [ :emap_route_node_p ], :ulong ],
+        [ :emap_route_node_time_get, [ :emap_route_node ], :ulong ],
         # EAPI double emap_route_nodes_distance_get(EMap_Route_Node *A, EMap_Route_Node *B);
-        [ :emap_route_nodes_distance_get, [ :emap_route_node_p, :emap_route_node_p ], :double ],
+        [ :emap_route_nodes_distance_get, [ :emap_route_node, :emap_route_node ], :double ],
         # EAPI void emap_route_node_free(EMap_Route_Node *node);
-        [ :emap_route_node_free, [ :emap_route_node_p ], :void ],
+        [ :emap_route_node_free, [ :emap_route_node ], :void ],
         # EAPI EMap_Route * emap_route_gpx_new(const char *file);
-        [ :emap_route_gpx_new, [ :string ], :emap_route_p ],
+        [ :emap_route_gpx_new, [ :string ], :emap_route ],
         ]
         #
         attach_fcts fcts