From 990cf6651a458e132a860c8ed3a2277ea43728cb Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Thu, 2 Oct 2014 10:41:06 +0100 Subject: [PATCH] elua: update eo lua API against generated lualian output --- src/bindings/luajit/eo.lua | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bindings/luajit/eo.lua b/src/bindings/luajit/eo.lua index 741c4bcee7..498483c65c 100644 --- a/src/bindings/luajit/eo.lua +++ b/src/bindings/luajit/eo.lua @@ -146,10 +146,9 @@ M.eo_class_get = function(name) return eo_classes[name] end -M.class_register = function(name, val, addr) - classes[name] = val - eo_classes[name] = addr - return val +M.class_register = function(name, parent, body, eocl) + classes[name] = classes[parent]:clone(body) + eo_classes[name] = eocl end M.class_unregister = function(name) @@ -157,6 +156,10 @@ M.class_unregister = function(name) eo_classes[name] = nil end +M.class_mixin = function(name, mixin) + classes[name]:mixin(classes[mixin]) +end + M.__ctor_common = function(self, klass, parent, ctor, loff, ...) local info = getinfo(2 + (loff or 0), "nlSf") local source = info.source