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

big refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-08-20 12:11:07 +02:00
parent c443509808
commit 9c2598646d
16 changed files with 292 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module.lua
+25 -37
View File
@@ -1,15 +1,10 @@
local tinsert, setfenv, rawget, rawset, setmetatable, mask, g = tinsert, setfenv, rawget, rawset, setmetatable, bit.band, getfenv(0)
local tinsert, setfenv, rawget, rawset, setmetatable, mask, add, g = tinsert, setfenv, rawget, rawset, setmetatable, bit.band, bit.bor, getfenv(0)
local DECLARED, ACCESSOR, MUTABLE, PUBLIC = 1, 2, 4, 8
local ACCESSOR_KEY, MUTABLE_KEY, PUBLIC_KEY = 'accessor', 'mutable', 'public'
local PROPERTY = {[ACCESSOR_KEY]=ACCESSOR, [MUTABLE_KEY]=MUTABLE, [PUBLIC_KEY]=PUBLIC}
local _data, _metadata, _modifier_properties, _imports, _envs, _interfaces = {}, {}, {}, {}, {}, {}
local metadata_mt = {
__index=function() return 0 end,
__newindex=function(self, key, value)
if rawget(self, key) then error('Duplicate key "'..key..'".', 3) end
rawset(self, key, value)
end,
}
local function error(message, ...) g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), 3) end
local metadata_mt = {__index=function() return 0 end}
local env_mt = {
__metatable = false,
__index = function(self, key)
@@ -25,16 +20,13 @@ local env_mt = {
return interface[key]
end
end
return g[key] or error('No key "'..key..'".', 2)
return g[key] or error('No field "%s".', key)
end
end,
__newindex = function(self, key, value)
local properties = _metadata[self][key]
if properties == 0 then
_metadata[self][key] = DECLARED
-- elseif mask(MUTABLE, properties) == 0 then
-- error('"'..key..'" is immutable.', 2)
end
if mask(DECLARED+MUTABLE, _metadata[self][key]) == DECLARED then error('Field "%s" is immutable.', key) end
_metadata[self][key] = add(DECLARED, properties)
_data[self][key] = value
end,
}
@@ -47,7 +39,7 @@ local interface_mt = {
elseif mask(PUBLIC, properties) ~= 0 then
return value(key)
else
error('No key "'..key..'".', 2)
error('No field "%s".', key)
end
end,
__newindex = function(self, key, value) self[key](value) end,
@@ -56,14 +48,14 @@ local modifier_mt = {
__metatable = false,
__index = function(self, key)
local property = PROPERTY[key]
if not property then error('Unsupported modifier "'..key..'".', 2) end
if mask(property, _modifier_properties[self]) ~= 0 then error('Duplicate modifier "'..key..'".', 2) end
_modifier_properties[self] = _modifier_properties[self] + property
if not property then error('Unknown modifier "%s".', key) end
_modifier_properties[self] = add(property, _modifier_properties[self])
return self
end,
__newindex = function(self, key, value)
_data[self][key] = value
if rawget(_metadata[self], key) then error('Field "%s" already exists.', key) end
_metadata[self][key] = _modifier_properties[self]
_data[self][key] = value
end,
}
local importer_mt = {
@@ -74,22 +66,18 @@ local importer_mt = {
end,
}
function g.aux_module(name)
if _interfaces[name] then error('Duplicate module "'..name..'".', 2) end
local data, metadata, imports, importer, modifier, env, interface, modifier_accessor
modifier, importer, env, interface = setmetatable({}, modifier_mt), setmetatable({}, importer_mt), setmetatable({}, env_mt), setmetatable({}, interface_mt)
function modifier_accessor(key) _modifier_properties[modifier] = DECLARED+PROPERTY[key] return modifier end
data = {g=g, m=env, import=importer, [ACCESSOR_KEY]=modifier_accessor, [MUTABLE_KEY]=modifier_accessor, [PUBLIC_KEY]=modifier_accessor}
metadata = setmetatable({g=DECLARED, m=DECLARED, import=DECLARED, [ACCESSOR_KEY]=ACCESSOR, [MUTABLE_KEY]=ACCESSOR, [PUBLIC_KEY]=ACCESSOR}, metadata_mt)
imports = {}
_envs[name], _interfaces[name] = env, interface
_data[modifier], _data[env], _data[interface] = data, data, data
_metadata[modifier], _metadata[env], _metadata[interface] = metadata, metadata, metadata
_imports[importer], _imports[env] = imports, imports
env.mutable.__ = nil -- TODO
setfenv(2, env)
return interface
if not _envs[name] then
local data, metadata, imports, importer, modifier, env, interface, modifier_accessor
modifier, importer, env, interface = setmetatable({}, modifier_mt), setmetatable({}, importer_mt), setmetatable({}, env_mt), setmetatable({}, interface_mt)
function modifier_accessor(key) _modifier_properties[modifier] = DECLARED+PROPERTY[key] return modifier end
data = {g=g, m=env, import=importer, [ACCESSOR_KEY]=modifier_accessor, [MUTABLE_KEY]=modifier_accessor, [PUBLIC_KEY]=modifier_accessor}
metadata = setmetatable({g=DECLARED, m=DECLARED, import=DECLARED, [ACCESSOR_KEY]=ACCESSOR, [MUTABLE_KEY]=ACCESSOR, [PUBLIC_KEY]=ACCESSOR}, metadata_mt)
imports = {}
_envs[name], _interfaces[name] = env, interface
_data[modifier], _data[env], _data[interface] = data, data, data
_metadata[modifier], _metadata[env], _metadata[interface] = metadata, metadata, metadata
_imports[importer], _imports[env] = imports, imports
end
setfenv(2, _envs[name])
return _interfaces[name]
end