Refactoring

[dragonblocks3d-lua.git] / src / class.lua

diff --git a/src/class.lua b/src/class.lua
index f424d733bca6aa9b422722e6a2f854ea18c6eec3..5b2c20fb7bf7be7859d9d685eabea9b4e0efa506 100644 (file)
--- a/src/class.lua
+++ b/src/class.lua
@@ -1,21 +1,14 @@
-local class = {}
-
-local instance_metatable = {
-       __index = function(t, k)
-               if k == "_call" then return end
-               local f = rawget(t._class, k)
-               if type(f) == "function" then
-                       return f
+function Dragonblocks.create_class()
+       local class = self or {}
+       setmetatable(class, {
+               __call = function(_, ...)
+                       local o = {}
+                       setmetatable(o, {__index = class})
+                       if o.constructor then
+                               o:constructor(...)
+                       end
+                       return o
                end
-       end
-}
-
-function class:_call(...)
-       local o = {class = self}
-       setmetatable(o, instance_metatable)
-       if o.constructor then
-               o:constructor(table.unpack(...))
-       end
-end 
-
-return class
+       })
+       return class
+end