summaryrefslogtreecommitdiff
path: root/src/bindings
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2015-03-03 15:59:16 +0000
committerDaniel Kolesa <d.kolesa@samsung.com>2015-03-03 15:59:16 +0000
commit4b01fd629855586318d061410c1a9ad16a64795d (patch)
tree347c0e4de257b88005631511f9fa49b39f12aed6 /src/bindings
parentc0e20c0c3d00faa8989ad8dfe2ecb7e1d8109996 (diff)
elua: eo_class_addr_get -> eo_obj_addr_get
Diffstat (limited to 'src/bindings')
-rw-r--r--src/bindings/luajit/eo.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bindings/luajit/eo.lua b/src/bindings/luajit/eo.lua
index f889c2107a..dec4ec9050 100644
--- a/src/bindings/luajit/eo.lua
+++ b/src/bindings/luajit/eo.lua
@@ -112,8 +112,8 @@ ffi.cdef [[
112 extern const Eo_Event_Description _EO_BASE_EVENT_DEL; 112 extern const Eo_Event_Description _EO_BASE_EVENT_DEL;
113]] 113]]
114 114
115local addr_d = ffi.typeof("union { double d; const Eo_Class *p; }") 115local addr_d = ffi.typeof("union { double d; const Eo *p; }")
116local eo_class_addr_get = function(x) 116local eo_obj_addr_get = function(x)
117 local v = addr_d() 117 local v = addr_d()
118 v.p = x 118 v.p = x
119 return tonumber(v.d) 119 return tonumber(v.d)
@@ -172,7 +172,7 @@ local init = function()
172 eo = util.lib_load("eo") 172 eo = util.lib_load("eo")
173 eo.eo_init() 173 eo.eo_init()
174 local eocl = eo.eo_base_class_get() 174 local eocl = eo.eo_base_class_get()
175 local addr = eo_class_addr_get(eocl) 175 local addr = eo_obj_addr_get(eocl)
176 classes["Eo_Base"] = util.Object:clone { 176 classes["Eo_Base"] = util.Object:clone {
177 connect = connect, 177 connect = connect,
178 disconnect = disconnect, 178 disconnect = disconnect,
@@ -247,13 +247,13 @@ M.class_register = function(name, parents, mixins, body, eocl)
247 for i = 2, #pars do lcl:add_parent(pars[i]) end 247 for i = 2, #pars do lcl:add_parent(pars[i]) end
248 for i = 1, #mins do lcl:add_mixin (mins[i]) end 248 for i = 1, #mins do lcl:add_mixin (mins[i]) end
249 249
250 local addr = eo_class_addr_get(eocl) 250 local addr = eo_obj_addr_get(eocl)
251 classes [name], classes [addr] = lcl , lcl 251 classes [name], classes [addr] = lcl , lcl
252 eo_classes[name], eo_classes[addr] = eocl, eocl 252 eo_classes[name], eo_classes[addr] = eocl, eocl
253end 253end
254 254
255M.class_unregister = function(name) 255M.class_unregister = function(name)
256 local addr = eo_class_addr_get(eo_classes[name]) 256 local addr = eo_obj_addr_get(eo_classes[name])
257 classes [name], classes [addr] = nil 257 classes [name], classes [addr] = nil
258 eo_classes[name], eo_classes[addr] = nil 258 eo_classes[name], eo_classes[addr] = nil
259end 259end
@@ -296,7 +296,7 @@ end
296local get_obj_mt = function(obj) 296local get_obj_mt = function(obj)
297 local cl = eo.eo_class_get(obj) 297 local cl = eo.eo_class_get(obj)
298 if cl == nil then return nil end 298 if cl == nil then return nil end
299 return classes[eo_class_addr_get(cl)] 299 return classes[eo_obj_addr_get(cl)]
300end 300end
301 301
302local prop_proxy_meta = { 302local prop_proxy_meta = {