Dusk/aux-addon-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-07-20 02:46:36 +02:00
parent 18c75775b6
commit 0f10f33891
1 changed files with 14 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module.lua
+14 -31
View File
@@ -1,33 +1,15 @@
local wrap, unwrap = (function()
local null = {}
return function(value)
if value == nil then
return null
else
return value
end
end,
function(value)
if value == null then
return nil
else
return value
end
end
end)()
function Aux_module(name) function Aux_module(name)
local data, is_public, public_interface, private_interface, public, private = {}, {}, {}, {}, {}, {} local data, is_public, is_declared, public_interface, private_interface, public, private = {}, {}, {}, {}, {}, {}, {}
setmetatable(public_interface, { setmetatable(public_interface, {
__newindex = function(_, key) __newindex = function(_, key)
error('Illegal write of attribute "'..key..'" on public interface of "'..name..'"!') error('Illegal write of attribute "'..key..'" on public interface of "'..name..'"!')
end, end,
__index = function(_, key) __index = function(_, key)
if data[key] == nil then if not is_public[key] then
error('Access of undeclared attribute "'..key..'" on public interface of "'..name..'"!') error('Access of undeclared attribute "'..key..'" on public interface of "'..name..'"!')
end end
if is_public[key] then if is_public[key] then
return unwrap(data[key]) return data[key]
end end
end, end,
__call = function(_, key) __call = function(_, key)
@@ -36,28 +18,29 @@ function Aux_module(name)
}) })
setmetatable(private_interface, { setmetatable(private_interface, {
__newindex = function(_, key, value) __newindex = function(_, key, value)
if data[key] == nil then if not is_declared[key] then
error('Assignment of undeclared attribute "'..key..'" on private interface of "'..name..'"!') error('Assignment of undeclared attribute "'..key..'" on private interface of "'..name..'"!')
end end
data[key] = wrap(value) data[key] = value
end, end,
__index = function(_, key) __index = function(_, key)
if data[key] == nil then if not is_declared[key] then
error('Access of undeclared attribute "'..key..'" on private interface of "'..name..'"!') error('Access of undeclared attribute "'..key..'" on private interface of "'..name..'"!')
end end
return unwrap(data[key]) return data[key]
end, end,
__call = function(_, key) __call = function(_, key)
return data[key] ~= nil return is_declared[key]
end end
}) })
setmetatable(public, { setmetatable(public, {
__newindex = function(_, key, value) __newindex = function(_, key, value)
if data[key] ~= nil then if is_declared[key] then
error('Multiple declarations of "'..key..'" in "'..name..'"!') error('Multiple declarations of "'..key..'" in "'..name..'"!')
end end
data[key] = wrap(value) data[key] = value
is_public[key] = true is_public[key] = true
is_declared[key] = true
end, end,
__index = function(_, key) __index = function(_, key)
error('Illegal read of attribute "'..key..'" on public keyword in "'..name..'"!') error('Illegal read of attribute "'..key..'" on public keyword in "'..name..'"!')
@@ -65,11 +48,11 @@ function Aux_module(name)
}) })
setmetatable(private, { setmetatable(private, {
__newindex = function(_, key, value) __newindex = function(_, key, value)
if data[key] ~= nil then if is_declared[key] then
error('Multiple declarations of "'..key..'" in "'..name..'"!') error('Multiple declarations of "'..key..'" in "'..name..'"!')
end end
data[key] = wrap(value) data[key] = value
is_public[key] = nil is_declared[key] = true
end, end,
__index = function(_, key) __index = function(_, key)
error('Illegal read of attribute "'..key..'" on private keyword in "'..name..'"!') error('Illegal read of attribute "'..key..'" on private keyword in "'..name..'"!')