From bbdb655bdb3299c8ead4ff43e9a7bea8555fc79d Mon Sep 17 00:00:00 2001
From: Daniel Kolesa <d.kolesa@samsung.com>
Date: Mon, 18 Aug 2014 14:00:32 +0100
Subject: [PATCH] elua: update lualian

---
 src/bin/elua/modules/lualian.lua | 17 +++++++++--------
 src/bindings/luajit/eolian.lua   |  9 +--------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/bin/elua/modules/lualian.lua b/src/bin/elua/modules/lualian.lua
index 6c499bb..ed69133 100644
--- a/src/bin/elua/modules/lualian.lua
+++ b/src/bin/elua/modules/lualian.lua
@@ -176,7 +176,7 @@ local Method = Node:clone {
         end
 
         for v in pars do
-            local dir, tps, nm = v:information_get()
+            local dir, tps, nm = v:direction_get(), v:type_get(), v:name_get()
             local tp = tps:c_type_get()
             if dir == dirs.OUT or dir == dirs.INOUT then
                 if dir == dirs.INOUT then
@@ -287,8 +287,9 @@ local Property = Method:clone {
                     rets[#rets + 1] = typeconv(tps, "v", false)
                 else
                     for i, v in ipairs(vals) do
-                        local dir, tps, nm = v:information_get()
-                        local tp = v:c_type_get()
+                        local dir, tps, nm = v:direction_get(), v:type_get(),
+                            v:name_get()
+                        local tp = tps:c_type_get()
                         cargs [#cargs  + 1] = tp .. " *" .. nm
                         vargs [#vargs  + 1] = nm
                         allocs[#allocs + 1] = { tp, nm }
@@ -299,7 +300,8 @@ local Property = Method:clone {
                 local argn = (#keys > 1) and "vals" or "val"
                 args[#args + 1] = argn
                 for i, v in ipairs(vals) do
-                    local dir, tps, nm = v:information_get()
+                    local dir, tps, nm = v:direction_get(), v:type_get(),
+                        v:name_get()
                     local tp = tps:c_type_get()
                     cargs[#cargs + 1] = tp .. " " .. nm
                     vargs[#vargs + 1] = typeconv(tps, argn .. "[" .. i .. "]",
@@ -602,7 +604,7 @@ local gen_contents = function(klass)
     -- first try properties
     local props = klass:functions_get(ft.PROPERTY):to_array()
     for i, v in ipairs(props) do
-        if v:scope_get() == eolian.function_scope.PUBLIC then
+        if v:scope_get() == eolian.object_scope.PUBLIC then
             local ftype  = v:type_get()
             local fread  = (ftype == ft.PROPERTY or ftype == ft.PROP_GET)
             local fwrite = (ftype == ft.PROPERTY or ftype == ft.PROP_SET)
@@ -617,7 +619,7 @@ local gen_contents = function(klass)
     -- then methods
     local meths = klass:functions_get(ft.METHOD):to_array()
     for i, v in ipairs(meths) do
-        if v:scope_get() == eolian.function_scope.PUBLIC then
+        if v:scope_get() == eolian.object_scope.PUBLIC then
             cnt[#cnt + 1] = Method(v)
         end
     end
@@ -633,8 +635,7 @@ local gen_contents = function(klass)
     local evs = {}
     local events = klass:events_get():to_array()
     for i, v in ipairs(events) do
-        local en, et, ed = v:information_get()
-        evs[#evs + 1] = Event(en, et, ed)
+        evs[#evs + 1] = Event(v:name_get(), v:type_get(), v:description_get())
     end
     return cnt, evs
 end
diff --git a/src/bindings/luajit/eolian.lua b/src/bindings/luajit/eolian.lua
index a7c9cb1..5a83581 100644
--- a/src/bindings/luajit/eolian.lua
+++ b/src/bindings/luajit/eolian.lua
@@ -380,7 +380,7 @@ M.Type = ffi.metatype("Eolian_Type", {
 
         enum_field_get = function(self, field)
             local v = eolian.eolian_type_enum_field_get(self, field)
-            if v == nil thenr eturn nil end
+            if v == nil then return nil end
             return v
         end,
 
@@ -469,13 +469,6 @@ M.Type = ffi.metatype("Eolian_Type", {
     }
 })
 
-M.Expression = ffi.metatype("Eolian_Expression", {
-    __index = {
-        eval = function(self, mask)
-        end
-    }
-})
-
 M.function_type = {
     UNRESOLVED = 0,
     PROPERTY   = 1,
-- 
2.7.4