kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elua: propagate property definitions down the inheritance hierarchy

This commit is contained in:
Daniel Kolesa 2014-06-05 10:23:42 +01:00
parent b665bdbd8a
commit 5ee0d530ca
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/elua/modules/lualian.lua
View File

@ -372,12 +372,18 @@ local Constructor = Method:clone {
local name = proto.name
local defctor = name == "constructor"
table.insert(proto.args, 2, "parent")
s:write( " ", defctor and "__ctor" or name, " = function(",
s:write(" __define_properties = function(self, proto)\n")
self.parent_node:gen_ctor(s)
s:write(" proto.__define_properties(self, proto.__proto)\n")
s:write(" end,\n\n")
s:write(" ", defctor and "__ctor" or name, " = function(",
table.concat(proto.args, ", "), ")\n")
if not defctor then
s:write(" self = self:clone()\n")
end
self.parent_node:gen_ctor(s)
s:write(" self:__define_properties(self.__proto.__proto)\n")
for i, v in ipairs(proto.allocs) do
s:write(" local ", v[2], " = ffi.new(\"", v[1], "[1]\")\n")
end
@ -397,8 +403,13 @@ local Constructor = Method:clone {
local Default_Constructor = Node:clone {
generate = function(self, s, last)
s:write( " __ctor = function(self, parent)\n")
s:write(" __define_properties = function(self, proto)\n")
self.parent_node:gen_ctor(s)
s:write(" proto.__define_properties(self, proto.__proto)\n")
s:write(" end,\n\n")
s:write( " __ctor = function(self, parent)\n")
s:write(" self:__define_properties(self.__proto.__proto)\n")
s:write(" self:__ctor_common(__lib.", self.parent_node.prefix,
"_class_get(), parent)\n")
s:write(" end", last and "" or ",", last and "\n" or "\n\n")