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 20:59:11 +02:00
parent fa1c3d5f40
commit ca5fd63fc6
2 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
init.lua
+2 -2
View File
@@ -54,8 +54,8 @@ end
ADDON_LOADED = {} ADDON_LOADED = {}
do do
local variables_loaded_hooks, player_login_hooks = {}, {} local variables_loaded_hooks, player_login_hooks = {}, {}
function public.accessor.LOAD(f) tinsert(variables_loaded_hooks, f) end function public.mutator.LOAD(f) tinsert(variables_loaded_hooks, f) end
function public.accessor.LOAD2(f) tinsert(player_login_hooks, f) end function public.mutator.LOAD2(f) tinsert(player_login_hooks, f) end
event_frame:SetScript('OnEvent', function() event_frame:SetScript('OnEvent', function()
if event == 'ADDON_LOADED' then if event == 'ADDON_LOADED' then
if ADDON_LOADED[arg1] then ADDON_LOADED[arg1]() end if ADDON_LOADED[arg1] then ADDON_LOADED[arg1]() end
module.lua
+30 -18
View File
@@ -1,9 +1,9 @@
local setmetatable, unpack, mask, add, g = setmetatable, unpack, bit.band, bit.bor, getfenv(0) local setmetatable, unpack, mask, add, g = setmetatable, unpack, bit.band, bit.bor, getfenv(0)
local DECLARED, PUBLIC, MUTABLE, ACCESSOR, MUTATOR = 1, 2, 4, 8, 16 local PRIVATE, PUBLIC, MUTABLE, ACCESSOR, MUTATOR = 1, 2, 4, 8, 16
local MODIFIER = {public=PUBLIC, mutable=MUTABLE, accessor=ACCESSOR, mutator=MUTATOR} local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, accessor=ACCESSOR, mutator=MUTATOR}
local _10, _01, tf, ft = {[true]=1, [false]=0}, {[true]=0, [false]=1}, {true, false}, {false, true} local _10, _01, tf, ft = {[true]=1, [false]=0}, {[true]=0, [false]=1}, {true, false}, {false, true}
local importer_mt, modifier_mt, env_mt, interface_mt, lock_mt local importer_mt, declarator_mt, env_mt, interface_mt, lock_mt
local define_property, declarator_accessor, public_accessor, mutable_accessor, accessor_accessor, mutator_accessor, index, error local define_property, declarator_accessor, private_accessor, public_accessor, mutable_accessor, accessor_accessor, mutator_accessor, index, error
local _modules, _metadata, _data, _accessors, _mutators, _imports, _declarators, _declarator_state = setmetatable({}, lock_mt), {}, {}, {}, {}, {}, {}, {} local _modules, _metadata, _data, _accessors, _mutators, _imports, _declarators, _declarator_state = setmetatable({}, lock_mt), {}, {}, {}, {}, {}, {}, {}
function error(message, ...) g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), 3) end function error(message, ...) g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), 3) end
importer_mt = {__metatable=false} importer_mt = {__metatable=false}
@@ -12,55 +12,67 @@ function importer_mt.__call(self, ...)
for i=1,arg.n do imports[arg[i]] = true end for i=1,arg.n do imports[arg[i]] = true end
end end
function declarator_accessor(modifier) function declarator_accessor(modifier)
return function(declarator) return function() _declarator_state[declarator] = DECLARED+modifier return declarator end end return function(declarator) return function() _declarator_state[declarator] = PRIVATE+modifier return declarator end end
end end
public_accessor, mutable_accessor, accessor_accessor, mutator_accessor = declarator_accessor(PUBLIC), declarator_accessor(MUTABLE), declarator_accessor(ACCESSOR), declarator_accessor(MUTATOR) private_accessor, public_accessor, mutable_accessor, accessor_accessor, mutator_accessor = declarator_accessor(0), declarator_accessor(PUBLIC), declarator_accessor(MUTABLE), declarator_accessor(ACCESSOR), declarator_accessor(MUTATOR)
function define_property(self, key, t) function define_property(self, key, t)
local accessor, mutator = t.get, t.set local accessor, mutator = t.get, t.set
_declarator_state[self] = add(_01[not accessor]*ACCESSOR, _01[not mutator]*MUTATOR, _declarator_state[self]) _declarator_state[self] = add(_01[not accessor]*ACCESSOR, _01[not mutator]*MUTATOR, _declarator_state[self])
_accessors[self][key], _mutators[self][key] = accessor, mutator _accessors[self][key], _mutators[self][key] = accessor, mutator
end end
modifier_mt = {__metatable=false} declarator_mt = {__metatable=false}
function modifier_mt.__index(self, key) function declarator_mt.__index(self, key)
local modifier = MODIFIER[key] local modifier = MODIFIER[key]
if not modifier then return function(t) define_property(self, key, t) end end if not modifier then return function(t) define_property(self, key, t) end end
_declarator_state[self] = add(modifier, _declarator_state[self]) _declarator_state[self] = add(modifier, _declarator_state[self])
return self return self
end end
function modifier_mt.__newindex(self, key, value) function declarator_mt.__newindex(self, key, value)
if _metadata[self][key] then error('Field "%s" already exists.', key) end if _metadata[self][key] then error('Field "%s" already exists.', key) end
_metadata[self][key], _data[self][key], _accessors[self][key], _mutators[self][key] = _declarator_state[self], value, value, value local modifiers = _declarator_state[self]
if mask(MUTABLE, modifiers) * mask(ACCESSOR+MUTABLE) ~= 0 then error('Invalid modifiers.') end
_metadata[self][key], _data[self][key], _accessors[self][key], _mutators[self][key] = modifiers, value, value, value
end end
function index(access, default) function index(access, default)
return function(self, key) return function(self, key)
local modifiers = _metadata[self][key] or 0 local modifiers = _metadata[self][key] or 0
if mask(access+ACCESSOR, modifiers) == access then if mask(access+ACCESSOR+MUTATOR, modifiers) == access then
return _data[self][key] return _data[self][key]
elseif mask(access, modifiers) ~= 0 then elseif mask(access+ACCESSOR, modifiers) == access+ACCESSOR then
return _accessors[self]() return _accessors[self]()
else else
return default[key] or error('No field "%s".', key) return default[key] or error('No field "%s".', key)
end end
end end
end end
env_mt = {__metatable=false, __index=index(DECLARED, g)} env_mt = {__metatable=false, __index=index(PRIVATE, g)}
function env_mt.__newindex(self, key, value) function env_mt.__newindex(self, key, value)
if not _metadata[self][key] then if not _metadata[self][key] then
_metadata[self][key] = DECLARED _metadata[self][key] = PRIVATE
elseif mask(MUTATOR, _metadata[self][key]) ~= 0 then
return _mutators[self][key](value)
elseif mask(MUTABLE, _metadata[self][key]) == 0 then elseif mask(MUTABLE, _metadata[self][key]) == 0 then
error('Field "%s" is immutable.', key) error('Field "%s" is immutable.', key)
end end
_data[self][key] = value _data[self][key] = value
end end
interface_mt = {__metatable=false, __index=index(PUBLIC, {})} interface_mt = {__metatable=false, __index=index(PUBLIC, {})}
function interface_mt.__newindex(self, key, value) self[key](value) end function interface_mt.__newindex(self, key, value)
if mask(PUBLIC+MUTATOR, _metadata[self][key]) == PUBLIC+MUTATOR then
return _mutators[self][key](value)
elseif mask(PUBLIC+MUTABLE, _metadata[self][key]) == PUBLIC+MUTABLE or error('Field "%s" is immutable.', key) then
_data[self][key] = value
end
end
lock_mt = {} lock_mt = {}
function g.aux_module(name) function g.aux_module(name)
if not _modules[name] then if not _modules[name] then
local metadata, data, accessors, mutators, imports, importer, declarator, env, interface local metadata, data, accessors, mutators, imports, importer, declarator, env, interface
imports, importer, declarator, env, interface = {}, setmetatable({}, importer_mt), setmetatable({}, modifier_mt), setmetatable({}, env_mt), setmetatable({}, interface_mt) imports, importer, declarator, env, interface = {}, setmetatable({}, importer_mt), setmetatable({}, declarator_mt), setmetatable({}, env_mt), setmetatable({}, interface_mt)
metadata = setmetatable({g=DECLARED, m=DECLARED, import=DECLARED, public=ACCESSOR, mutable=ACCESSOR, accessor=ACCESSOR, mutator=ACCESSOR}, lock_mt) metadata = setmetatable({g=PRIVATE, m=PRIVATE, import=PRIVATE, private=PRIVATE+ACCESSOR, public=PRIVATE+ACCESSOR, mutable=PRIVATE+ACCESSOR, accessor=PRIVATE+ACCESSOR, mutator=PRIVATE+ACCESSOR}, lock_mt)
data = {g=g, m=env, import=importer, public=public_accessor(declarator), mutable=mutable_accessor(declarator), accessor=accessor_accessor(declarator), mutator=mutator_accessor(declarator)} data = {g=g, m=env, import=importer}
accessors = {private=private_accessor(declarator), public=public_accessor(declarator), mutable=mutable_accessor(declarator), accessor=accessor_accessor(declarator), mutator=mutator_accessor(declarator)}
mutators = {}
_metadata[name], _metadata[declarator], _metadata[env], _metadata[interface] = metadata, metadata, metadata, metadata _metadata[name], _metadata[declarator], _metadata[env], _metadata[interface] = metadata, metadata, metadata, metadata
_data[name], _data[declarator], _data[env], _data[interface] = data, data, data, data _data[name], _data[declarator], _data[env], _data[interface] = data, data, data, data
_accessors[name], _accessors[declarator], _accessors[env], _accessors[interface] = accessors, accessors, accessors, accessors _accessors[name], _accessors[declarator], _accessors[env], _accessors[interface] = accessors, accessors, accessors, accessors