From be200921ef9b4d4dc5c56f60728a42ac824ca5ad Mon Sep 17 00:00:00 2001 From: Manuel Simon Hirsig Date: Sun, 31 Jul 2016 12:25:57 +0200 Subject: [PATCH] refactoring --- core.lua | 4 ++-- module.lua | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core.lua b/core.lua index 7acb9e2..38f3eab 100644 --- a/core.lua +++ b/core.lua @@ -1,10 +1,10 @@ -local addon = Aux_module('Aux') +local addon = Aux_module() Aux = tremove(addon, 1) local m, public, private = unpack(addon) private.modules = { Aux } function public.module(name) - local module = Aux_module(name) + local module = Aux_module() local public_interface = tremove(module, 1) tinsert(m.modules, public_interface) public[name] = public_interface diff --git a/module.lua b/module.lua index 430b8cf..fa621d9 100644 --- a/module.lua +++ b/module.lua @@ -1,12 +1,12 @@ -function Aux_module(name) +function Aux_module() local data, is_public, is_declared, public_interface, private_interface, public, private = {}, {}, {}, {}, {}, {}, {} setmetatable(public_interface, { - __newindex = function(_, key) - error('Illegal write of attribute "'..key..'" on public interface of "'..name..'"!', 2) + __newindex = function() + error('Unsupported operation.', 2) end, __index = function(_, key) if not is_public[key] then - error('Access of undeclared attribute "'..key..'" on public interface of "'..name..'"!', 2) + error('Read of undeclared "'..key..'".', 2) end if is_public[key] then return data[key] @@ -19,13 +19,13 @@ function Aux_module(name) setmetatable(private_interface, { __newindex = function(_, key, value) if not is_declared[key] then - error('Assignment of undeclared attribute "'..key..'" on private interface of "'..name..'"!', 2) + error('Write of undeclared "'..key..'".', 2) end data[key] = value end, __index = function(_, key) if not is_declared[key] then - error('Access of undeclared attribute "'..key..'" on private interface of "'..name..'"!', 2) + error('Read of undeclared "'..key..'".', 2) end return data[key] end, @@ -36,26 +36,26 @@ function Aux_module(name) setmetatable(public, { __newindex = function(_, key, value) if is_declared[key] then - error('Multiple declarations of "'..key..'" in "'..name..'"!', 2) + error('Multiple declarations of "'..key..'".', 2) end data[key] = value is_public[key] = true is_declared[key] = true end, - __index = function(_, key) - error('Illegal read of attribute "'..key..'" on public keyword in "'..name..'"!', 2) + __index = function() + error('Unsupported operation.', 2) end, }) setmetatable(private, { __newindex = function(_, key, value) if is_declared[key] then - error('Multiple declarations of "'..key..'" in "'..name..'"!', 2) + error('Multiple declarations of "'..key..'".', 2) end data[key] = value is_declared[key] = true end, - __index = function(_, key) - error('Illegal read of attribute "'..key..'" on private keyword in "'..name..'"!', 2) + __index = function() + error('Unsupported operation.', 2) end, }) return { public_interface, private_interface, public, private }