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

refactoring

Browse Source
This commit is contained in:
Manuel Simon Hirsig
2016-08-24 19:20:30 +02:00
parent e679f487a1
commit 907b3e205a
2 changed files with 72 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aux-addon.lua
+27 -20
View File
@@ -3,9 +3,12 @@ public.version = '5.0.0'
do do
local bids_loaded local bids_loaded
public.bids_loaded() public.property.bids_loaded{
function accessor() return bids_loaded end get = function() return bids_loaded end,
function mutator(value) bids_loaded = value end set = function(value) bids_loaded = value end,
}
-- function public.bids_loaded.get()
-- end
end end
do do
local current_owner_page local current_owner_page
@@ -15,7 +18,7 @@ do
end end
do do
local pool, weak_pool, transient = {}, setmetatable({}, {__mode='v'}), {} local pool, overflow_pool, transient = {}, setmetatable({}, {__mode='v'}), {}
CreateFrame'Frame':SetScript('OnUpdate', function() CreateFrame'Frame':SetScript('OnUpdate', function()
for t in transient do recycle(t) end for t in transient do recycle(t) end
wipe(transient) wipe(transient)
@@ -31,35 +34,39 @@ do
if getn(pool) < 50 then if getn(pool) < 50 then
tinsert(pool, t) tinsert(pool, t)
else else
tinsert(weak_pool, t) tinsert(overflow_pool, t)
end end
log(getn(table_pool), '-', getn(weak_pool)) log(getn(table_pool), '-', getn(overflow_pool))
end end
function public.accessor.t() function public.accessor.t()
return tremove(pool) or tremove(weak_pool) or {} return tremove(pool) or tremove(overflow_pool) or {}
end end
function public.accessor.tt() function public.accessor.tt()
local t = tremove(pool) or tremove(weak_pool) or {} local t = tremove(pool) or tremove(overflow_pool) or {}
transient[t] = true transient[t] = true
return t return t
end end
function public.operator_mt(f) function public.operator_mt(f)
local function apply(self, value) recycle(self); return self.raw and setmetatable(f(value), nil) or f(value) end local function apply(self, value)
local raw = self.raw
recycle(self)
return raw and setmetatable(f(value), nil) or f(value)
end
return {__unm=function(self) self.raw = true end, __call=apply, __sub=apply} return {__unm=function(self) self.raw = true end, __call=apply, __sub=apply}
end end
do do
local temp, temp_mt, perm, perm_mt local make_transient, make_persistent, temp_mt, perm_mt
function temp(t) transient[t] = true return t end function make_transient(t) transient[t] = true return t end
temp_mt = operator_mt(temp) function make_persistent(t) transient[t] = nil return t end
function perm(t) transient[t] = nil return t end temp_mt = operator_mt(make_transient)
perm_mt = operator_mt(perm) perm_mt = operator_mt(make_persistent)
function public.accessor.temp() return setmetatable(t, temp_mt) end function public.accessor.temp() return setmetatable(t, temp_mt) end
function mutator(t) return temp(t) end function mutator(t) return make_transient(t) end
function public.accessor.perm() return setmetatable(t, perm_mt) end function public.accessor.perm() return setmetatable(t, perm_mt) end
function mutator(t) return perm(t) end function mutator(t) return make_persistent(t) end
end end
local function keys(t,k1,k2,k3,k4,k5,k6,k7,k8,k9,k10,k11,k12,k13,k14,k15,k16,k17,k18,k19,k20,overflow) local function keys(t,k1,k2,k3,k4,k5,k6,k7,k8,k9,k10,k11,k12,k13,k14,k15,k16,k17,k18,k19,k20,overflow)
assert(overflow == nil, 'Overflow.') if overflow ~= nil then error 'Overflow.' end
if k1 ~= nil then t[k1] = true end if k1 ~= nil then t[k1] = true end
if k2 ~= nil then t[k2] = true end if k2 ~= nil then t[k2] = true end
if k3 ~= nil then t[k3] = true end if k3 ~= nil then t[k3] = true end
@@ -83,7 +90,7 @@ do
return t return t
end end
local function values(t,v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,overflow) local function values(t,v1,v2,v3,v4,v5,v6,v7,v8,v9,v10,v11,v12,v13,v14,v15,v16,v17,v18,v19,v20,overflow)
assert(overflow == nil, 'Overflow.') if overflow ~= nil then error 'Overflow.' end
if v1 ~= nil then tinsert(t, v1) end if v1 ~= nil then tinsert(t, v1) end
if v2 ~= nil then tinsert(t, v2) end if v2 ~= nil then tinsert(t, v2) end
if v3 ~= nil then tinsert(t, v3) end if v3 ~= nil then tinsert(t, v3) end
@@ -107,7 +114,7 @@ do
return t return t
end end
local function pairs(t,k1,v1,k2,v2,k3,v3,k4,v4,k5,v5,k6,v6,k7,v7,k8,v8,k9,v9,k10,v10,overflow) local function pairs(t,k1,v1,k2,v2,k3,v3,k4,v4,k5,v5,k6,v6,k7,v7,k8,v8,k9,v9,k10,v10,overflow)
assert(overflow == nil, 'Overflow.') if overflow ~= nil then error 'Overflow.' end
if k1 ~= nil then t[k1] = v1 end if k1 ~= nil then t[k1] = v1 end
if k2 ~= nil then t[k2] = v2 end if k2 ~= nil then t[k2] = v2 end
if k3 ~= nil then t[k3] = v3 end if k3 ~= nil then t[k3] = v3 end
@@ -130,7 +137,7 @@ do
function public.accessor.set() return setmetatable(t, set_mt) end function public.accessor.set() return setmetatable(t, set_mt) end
function public.accessor.list() return setmetatable(t, list_mt) end function public.accessor.list() return setmetatable(t, list_mt) end
function public.accessor.object() return setmetatable(t, object_mt) end function public.accessor.object() return setmetatable(t, object_mt) end
-- TODO or 'auto' 'free' 'deprecate' 'release' 'transient'? -- TODO or 'auto' 'transient'?
end end
local event_frame = CreateFrame 'Frame' local event_frame = CreateFrame 'Frame'
module.lua
+45 -36
View File
@@ -1,9 +1,9 @@
local type, setmetatable, setfenv, unpack, mask, _g = type, setmetatable, setfenv, unpack, bit.band, getfenv(0) local type, setmetatable, setfenv, unpack, band, _g = type, setmetatable, setfenv, unpack, bit.band, getfenv(0)
local PRIVATE, PUBLIC, MUTABLE, PROPERTY, ACCESSOR, MUTATOR = 0, 1, 2, 4, 8, 16 local PRIVATE, PUBLIC, MUTABLE, PROPERTY, ACCESSOR, MUTATOR = 0, 1, 2, 4, 8, 16
local error, import_error, modifier_error, property_error, immutable_error, collision_error, set_property, env_mt, interface_mt, declarator_mt, importer_mt local error, import_error, declaration_error, property_error, immutable_error, collision_error, set_property, env_mt, interface_mt, declarator_mt, importer_mt
local _state, _modules = {}, {} local _state, _modules = {}, {}
function error(message, ...) return _g.error(format(message or '', unpack(arg))..'\n'..debugstack(), 0) end function error(message, ...) return _g.error(format(message or '', unpack(arg))..'\n'..debugstack(), 0) end
import_error, modifier_error, property_error = function() error 'Invalid modifiers.' end, function() error 'Invalid modifiers.' end, function() error 'Accessor/Mutator must be function.' end import_error, declaration_error, property_error = function() error 'Invalid modifiers.' end, function() error 'Invalid declaration.' end, function() error 'Accessor/Mutator must be function.' end
immutable_error, collision_error = function(key) error('Field "%s" is immutable.', key) end, function(key) error('Field "%s" already exists.', key) end immutable_error, collision_error = function(key) error('Field "%s" is immutable.', key) end, function(key) error('Field "%s" already exists.', key) end
importer_mt = {__metatable=false} importer_mt = {__metatable=false}
function importer_mt.__index(self, key) function importer_mt.__index(self, key)
@@ -19,8 +19,8 @@ function importer_mt.__call(self, arg1, arg2)
if module then if module then
if alias == '' then if alias == '' then
for key, modifiers in module.metadata do for key, modifiers in module.metadata do
if not state.metadata[key] and mask(PUBLIC, modifiers) ~= 0 then if not state.metadata[key] and band(PUBLIC, modifiers) ~= 0 then
state.metadata[key], state.data[key], state.accessors[key], state.mutators[key] = modifiers, module.data[key], module.accessors[key], module.mutators[key] state.metadata[key], state.data[key], state.getters[key], state.setters[key] = modifiers, module.data[key], module.getters[key], module.setters[key]
end end
end end
elseif not state.metadata[alias] then elseif not state.metadata[alias] then
@@ -37,38 +37,47 @@ function set_property(metadata, data, modifier, key, f)
end end
declarator_mt = {__metatable=false} declarator_mt = {__metatable=false}
do do
local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, accessor=ACCESSOR+PROPERTY, mutator=MUTATOR+PROPERTY} local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE}
local MODIFIER_MASK, PROPERTY_MASK = {private=MUTABLE+ACCESSOR+MUTATOR, public=ACCESSOR+MUTATOR, mutable=PRIVATE, accessor=PRIVATE+PUBLIC, mutator=PRIVATE+PUBLIC}, PRIVATE+PUBLIC local MASK = {private=MUTABLE+ACCESSOR+MUTATOR, public=ACCESSOR+MUTATOR, mutable=PRIVATE}
function declarator_mt.__index(self, key) function declarator_mt.__index(self, key)
local state, modifier = _state[self], MODIFIER[key]; local modifiers = state.modifiers local state, modifier, mask = _state[self], MODIFIER[key], MASK[key]; local modifiers = state.modifiers
if modifier then if state.property then declaration_error() end
if mask(MODIFIER_MASK[key], modifiers) ~= modifiers then modifier_error() end if not modifier then modifier, mask, state.property = PROPERTY, PRIVATE+PUBLIC, key end
state.modifiers = modifiers + modifier if band(mask, modifiers) ~= modifiers then declaration_error() end
elseif not state.metadata[key] or collision_error(key) then state.modifiers = modifiers + modifier
if mask(PROPERTY_MASK, modifiers) ~= modifiers then modifier_error() end
state.property, state.metadata[key], state.modifiers = key, modifiers + PROPERTY, PRIVATE
end
return self return self
end end
end end
function declarator_mt.__newindex(self, key, value) do
local state = _state[self] local function declare(self, key, value)
if state.metadata[key] then collision_error(key) end local state = _state[self]; local metadata = state.metadata
state.metadata[key] = state.modifiers if metadata[key] then collision_error(key) end
if mask(PROPERTY, state.modifiers) == 0 then metadata[key], state[self] = state[self], PRIVATE
state.data[key] = value if band(PROPERTY, metadata[key]) == 0 then
elseif type(value) == 'function' or property_error() then state.data[key] = value
local data = mask(ACCESSOR, state.modifiers) ~= 0 and state.accessors or state.mutators else
state.property, data[key] = key, value local success, getter, setter = pcall(function() return value.get, value.set end)
if success or error 'Invalid property definition.' then
if getter ~= nil and (type(getter) == 'function' or error 'Getter must be a function.') then
state.getters[key] = getter
end
if setter ~= nil and (type(setter) == 'function' or error 'Setter must be a function.') then
state.setters[key] = setter
end
end
end
end
declarator_mt.__newindex = declare
function declarator_mt.__call(self, value)
local state = _state[self]; local property = state.property
if property then declare(self, property, value) end
end end
state.modifiers = PRIVATE
end end
function declarator_mt.__call() end
do do
local function index(access, default) local function index(access, default)
return function(self, key) return function(self, key)
local state = _state[self]; local modifiers = state.metadata[key] or 0 local state = _state[self]; local modifiers = state.metadata[key] or 0
if mask(access+ACCESSOR, modifiers) == access+ACCESSOR then return state.accessors[key]() end if band(access+ACCESSOR, modifiers) == access+ACCESSOR then return state.getters[key]() end
return state.data[key] or default[key] return state.data[key] or default[key]
end end
end end
@@ -76,9 +85,9 @@ do
function env_mt.__newindex(self, key, value) function env_mt.__newindex(self, key, value)
local state = _state[self]; local modifiers = state.metadata[key] local state = _state[self]; local modifiers = state.metadata[key]
if modifiers then if modifiers then
local mutator = state.mutators[key] local mutator = state.setters[key]
if mutator then return mutator(value) end if mutator then return mutator(value) end
if mask(MUTABLE, modifiers) == 0 then immutable_error(key) end if band(MUTABLE, modifiers) == 0 then immutable_error(key) end
else else
state.metadata[key] = state.modifiers state.metadata[key] = state.modifiers
end end
@@ -87,26 +96,26 @@ do
interface_mt = {__metatable=false, __index=index(PUBLIC, {})} interface_mt = {__metatable=false, __index=index(PUBLIC, {})}
function interface_mt.__newindex(self, key, value) function interface_mt.__newindex(self, key, value)
local state = _state[self]; local metadata = state.metadata local state = _state[self]; local metadata = state.metadata
if metadata and mask(PUBLIC+MUTATOR, metadata) == PUBLIC+MUTATOR then if metadata and band(PUBLIC+MUTATOR, metadata) == PUBLIC+MUTATOR then
return state.mutators[key](value) return state.setters[key](value)
elseif mask(PUBLIC+PROPERTY, metadata) == PUBLIC then elseif band(PUBLIC+PROPERTY, metadata) == PUBLIC then
return state.data[key](value) return state.data[key](value)
end end
end end
end end
function module(name) function module(name)
if not _modules[name] then if not _modules[name] then
local state, accessors, mutators, env, interface, declarator, importer local state, getters, setters, env, interface, declarator, importer
env, interface, declarator, importer = setmetatable({}, env_mt), setmetatable({}, interface_mt), setmetatable({}, declarator_mt), setmetatable({}, importer_mt) env, interface, declarator, importer = setmetatable({}, env_mt), setmetatable({}, interface_mt), setmetatable({}, declarator_mt), setmetatable({}, importer_mt)
accessors = { getters = {
private=function() state.modifiers = PRIVATE return declarator end, public=function() state.modifiers = PUBLIC return declarator end, private=function() state.modifiers = PRIVATE return declarator end, public=function() state.modifiers = PUBLIC return declarator end,
mutable=function() state.modifiers = MUTABLE return declarator end, mutable=function() state.modifiers = MUTABLE return declarator end,
accessor=function() state.modifiers = PROPERTY+ACCESSOR return declarator end, mutator=function() state.modifiers = PROPERTY+MUTATOR return declarator end} accessor=function() state.modifiers = PROPERTY+ACCESSOR return declarator end, mutator=function() state.modifiers = PROPERTY+MUTATOR return declarator end}
mutators = {accessor=function(f) set_property(state.metadata, accessors, ACCESSOR, state.property, f) end, mutator=function(f) set_property(state.metadata, mutators, MUTATOR, state.property, f) end} setters = {accessor=function(f) set_property(state.metadata, getters, ACCESSOR, state.property, f) end, mutator=function(f) set_property(state.metadata, setters, MUTATOR, state.property, f) end}
state = { state = {
env=env, interface=interface, modifiers=PRIVATE, env=env, interface=interface, modifiers=PRIVATE,
metadata = {_=MUTABLE, _g=PRIVATE, _m=PRIVATE, _i=PRIVATE, error=PRIVATE, import=PRIVATE, private=PROPERTY+ACCESSOR, public=PROPERTY+ACCESSOR, mutable=PROPERTY+ACCESSOR, accessor=PROPERTY+ACCESSOR+MUTATOR, mutator=PROPERTY+ACCESSOR+MUTATOR}, metadata = {_=MUTABLE, _g=PRIVATE, _m=PRIVATE, _i=PRIVATE, error=PRIVATE, import=PRIVATE, private=PROPERTY+ACCESSOR, public=PROPERTY+ACCESSOR, mutable=PROPERTY+ACCESSOR, accessor=PROPERTY+ACCESSOR+MUTATOR, mutator=PROPERTY+ACCESSOR+MUTATOR},
data = {_g=_g, _m=env, _i=interface, error=error, import=importer}, accessors=accessors, mutators=mutators, data = {_g=_g, _m=env, _i=interface, error=error, import=importer}, getters=getters, setters=setters,
} }
_modules[name], _state[env], _state[interface], _state[declarator], _state[importer] = state, state, state, state, state _modules[name], _state[env], _state[interface], _state[declarator], _state[importer] = state, state, state, state, state
importer [''] 'core' importer [''] 'core'