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-25 17:03:56 +02:00
parent 9364879da0
commit db41eebbf2
6 changed files with 142 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aux-addon.lua
+12 -43
View File
@@ -22,31 +22,31 @@ public.empty = {}
public.pass = function() end public.pass = function() end
do do
local pool, overflow_pool, transient = {}, setmetatable({}, {__mode='v'}), {} local pool, weak_pool, transient = {}, setmetatable({}, {__mode='v'}), {}
CreateFrame'Frame':SetScript('OnUpdate', function() CreateFrame'Frame':SetScript('OnUpdate', function()
for t in transient do recycle(t) end -- local t = tremove(transient)
for _, t in transient do recycle(t) end
wipe(transient) wipe(transient)
end) end)
function public.wipe(t) -- like with a cloth or something function public.wipe(t) -- like with a cloth or something
for k in t do t[k] = nil end for k in t do t[k] = nil end
table.setn(t, 0) table.setn(t, 0)
return setmetatable(t, nil) return t
end end
function public.recycle(t) function public.recycle(t)
transient[t] = nil
wipe(t) wipe(t)
if getn(pool) < 50 then if getn(pool) < 50 then
tinsert(pool, t) tinsert(pool, t)
else else
tinsert(overflow_pool, t) tinsert(weak_pool, t)
end end
log(getn(table_pool), '-', getn(overflow_pool)) log(getn(table_pool), '-', getn(weak_pool))
end end
function public.t.get() function public.t.get()
return tremove(pool) or tremove(overflow_pool) or {} return tremove(pool) or tremove(weak_pool) or {}
end end
function public.tt.get() function public.tt.get()
local t = tremove(pool) or tremove(overflow_pool) or {} local t = tremove(pool) or tremove(weak_pool) or {}
transient[t] = true transient[t] = true
return t return t
end end
@@ -59,45 +59,14 @@ do
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 make_transient, make_persistent, temp_mt, perm_mt local make_transient, temp_mt
function make_transient(t) transient[t] = true return t end function make_transient(t) tinsert(transient, t) return t end
function make_persistent(t) transient[t] = nil return t end
temp_mt = operator_mt(make_transient) temp_mt = operator_mt(make_transient)
perm_mt = operator_mt(make_persistent)
public.temp public.temp
{ {
get = function() return setmetatable(t, temp_mt) end, get = function() return setmetatable(t, temp_mt) end,
set = function(t) return make_transient(t) end, set = function(t) return make_transient(t) end,
} }
public.perm
{
get = function() return setmetatable(t, perm_mt) end,
set = function(t) return make_persistent(t) 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)
if overflow ~= nil then error 'Overflow.' end
if k1 ~= nil then t[k1] = true end
if k2 ~= nil then t[k2] = true end
if k3 ~= nil then t[k3] = true end
if k4 ~= nil then t[k4] = true end
if k5 ~= nil then t[k5] = true end
if k6 ~= nil then t[k6] = true end
if k7 ~= nil then t[k7] = true end
if k8 ~= nil then t[k8] = true end
if k9 ~= nil then t[k9] = true end
if k10 ~= nil then t[k10] = true end
if k11 ~= nil then t[k11] = true end
if k12 ~= nil then t[k12] = true end
if k13 ~= nil then t[k13] = true end
if k14 ~= nil then t[k14] = true end
if k15 ~= nil then t[k15] = true end
if k16 ~= nil then t[k16] = true end
if k17 ~= nil then t[k17] = true end
if k18 ~= nil then t[k18] = true end
if k19 ~= nil then t[k19] = true end
if k20 ~= nil then t[k20] = true end
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)
if overflow ~= nil then error 'Overflow.' end if overflow ~= nil then error 'Overflow.' end
@@ -142,13 +111,13 @@ do
end end
local set_mt, list_mt, object_mt = collector_mt(keys), collector_mt(values), collector_mt(pairs) local set_mt, list_mt, object_mt = collector_mt(keys), collector_mt(values), collector_mt(pairs)
public.property() public.property()
set, list, object = {get=function() return setmetatable(t, set_mt) end}, {get=function() return setmetatable(t, list_mt) end}, {get=function() return setmetatable(t, object_mt) end} list, object = {get=function() return setmetatable(t, list_mt) end}, {get=function() return setmetatable(t, object_mt) end}
private() private()
-- TODO or 'auto' 'transient'? -- TODO or 'auto' 'transient'?
end end
local event_frame = CreateFrame 'Frame' local event_frame = CreateFrame 'Frame'
for event in -temp-set('ADDON_LOADED', 'VARIABLES_LOADED', 'PLAYER_LOGIN', 'AUCTION_HOUSE_SHOW', 'AUCTION_HOUSE_CLOSED', 'AUCTION_BIDDER_LIST_UPDATE', 'AUCTION_OWNED_LIST_UPDATE') do for _, event in -temp-list('ADDON_LOADED', 'VARIABLES_LOADED', 'PLAYER_LOGIN', 'AUCTION_HOUSE_SHOW', 'AUCTION_HOUSE_CLOSED', 'AUCTION_BIDDER_LIST_UPDATE', 'AUCTION_OWNED_LIST_UPDATE') do
event_frame:RegisterEvent(event) event_frame:RegisterEvent(event)
end end
core/disenchant.lua
+2 -2
View File
@@ -39,7 +39,7 @@ do
end end
function LOAD() function LOAD()
ARMOR = -set( ARMOR = set(
'INVTYPE_HEAD', 'INVTYPE_HEAD',
'INVTYPE_NECK', 'INVTYPE_NECK',
'INVTYPE_SHOULDER', 'INVTYPE_SHOULDER',
@@ -56,7 +56,7 @@ function LOAD()
'INVTYPE_CLOAK', 'INVTYPE_CLOAK',
'INVTYPE_HOLDABLE' 'INVTYPE_HOLDABLE'
) )
WEAPON = -set( WEAPON = set(
'INVTYPE_2HWEAPON', 'INVTYPE_2HWEAPON',
'INVTYPE_WEAPONMAINHAND', 'INVTYPE_WEAPONMAINHAND',
'INVTYPE_WEAPON', 'INVTYPE_WEAPON',
module.lua
+115 -88
View File
@@ -1,41 +1,27 @@
local type, setmetatable, setfenv, unpack, next, mask, pcall, _G = type, setmetatable, setfenv, unpack, next, bit.band, pcall, getfenv(0) local type, setmetatable, setfenv, unpack, next, mask, combine, pcall, _G = type, setmetatable, setfenv, unpack, next, bit.band, bit.bor, pcall, getfenv(0)
local PRIVATE, PUBLIC, MUTABLE, DYNAMIC, PROPERTY = 0, 1, 2, 4, 8 local error, import_error, declaration_error, collision_error, mutability_error
local function error(message, ...) return _G.error(format(message or '', unpack(arg))..'\n'..debugstack(), 0) end local pass, env_mt, interface_mt, declarator_mt, importer_mt
local import_error, declaration_error = function() error 'Invalid import statement.' end, function() error 'Invalid declaration.' end
local collision_error, mutability_error = function(key) error('Field "%s" already exists.', key) end, function(key) error('Field "%s" is immutable.', key) end local PRIVATE, PUBLIC, MUTABLE, DYNAMIC, PROPERTY = 1, 2, 4, 8, 16
local declare, env_mt, interface_mt, declarator_mt, importer_mt
local empty, pass = {}, function() end
local _state, _modules = {}, {} local _state, _modules = {}, {}
importer_mt = {__metatable=false }
function error(message, ...)
return _G.error(format(message or '', unpack(arg))..'\n'..debugstack(), 0)
end
import_error = function() error 'Invalid import statement.' end
declaration_error = function() error 'Invalid declaration.' end
collision_error = function(key) error('Field "%s" already exists.', key) end
mutability_error = function(key) error('Field "%s" is immutable.', key) end
pass = function() end
function get()
setfenv()
end
do do
local function unpack_property_value(t) importer_mt = {__metatable=false}
local get, set; get, set, t.get, t.set = t.get or pass, t.set or pass, nil, nil local function import(state, module, alias)
if next(t) or type(get ~= 'function') or type(set) ~= 'function' then error() end
return get, set
end
function declare(self, modifiers, key, value)
local metadata = self.metadata
if metadata[key] then collision_error(key) end
metadata[key] = modifiers
if mask(PROPERTY, modifiers) ~= 0 then
local success, getter, setter = pcall(unpack_property_value, value)
if success or declaration_error() then self.getters[key], self.setters[key] = getter, setter end
else
self.data[key] = value
end
end
end
function importer_mt.__index(self, key, state) state=_state[self]
if type(key) ~= 'string' then import_error() end
state[self] = key; return self
end
function importer_mt.__call(self, arg1, arg2, state) state=_state[self]
local name, module, alias
name = arg2 or arg1
if type(name) ~= 'string' then import_error() end
module = _modules[name]
alias, state[self] = state[self] or name, nil
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 mask(PUBLIC, modifiers) ~= 0 then
@@ -46,47 +32,71 @@ function importer_mt.__call(self, arg1, arg2, state) state=_state[self]
state.metadata[alias], state.data[alias] = PRIVATE, module.interface state.metadata[alias], state.data[alias] = PRIVATE, module.interface
end end
end end
return self function importer_mt:__index(key, state) state=_state[self]
end state[self] = key; return self
declarator_mt = {__metatable=false} end
do function importer_mt:__call(arg1, arg2, state) state=_state[self]
local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE} local name, alias, module; name = arg2 or arg1
local COMPATIBLE = {private=MUTABLE+PROPERTY, public=PROPERTY, mutable=PRIVATE} alias, state[self] = state[self] or name, nil
function declarator_mt.__index(self, key, state) state=_state[self] return pcall(import, state, _modules[name], alias) and self or import_error()
if state.property then declaration_error() end
local modifiers, modifier, compatible = state[self], MODIFIER[key], COMPATIBLE[key]
if not modifier then modifier, compatible, state.property = PROPERTY, PRIVATE+PUBLIC, key end
if mask(compatible, modifiers) ~= modifiers then declaration_error() end
state[self] = modifiers + modifier
return self
end end
end end
do do
declarator_mt.__newindex = function(self, key, value, state) state=_state[self] local declare
local property, modifiers; property, modifiers, state[self] = state.property, state[self], PRIVATE do
if property then state.property = nil; declare(state, modifiers, property, {[key]=value}) end local function unpack_property_value(t)
end local get, set; get, set, t.get, t.set = t.get or pass, t.set or pass, nil, nil
function declarator_mt.__call(self, value, state) state=_state[self] if next(t) or type(get) ~= 'function' or type(set) ~= 'function' then error() end
local property, modifiers; property, modifiers, state[self] = state.property, state[self], PRIVATE return get, set
if property then state.property = nil; declare(state, modifiers, property, value) else state.modifiers = modifiers end end
end function declare(state, modifiers, key, value)
end local metadata = state.metadata
do metadata[key] = metadata[key] and collision_error(key) or modifiers
local function index(public) if mask(PROPERTY, modifiers) == 0 then
local access = public and PUBLIC or 0 state.data[key] = value
return function(self, key, state) state=_state[self] else
local masked = mask(access+PROPERTY, state.metadata[key] or 0) local success, getter, setter = pcall(unpack_property_value, value)
if masked == access+PROPERTY then if success or declaration_error() then state.getters[key], state.setters[key] = getter, setter end
return state.getters[key]()
elseif masked == access then
return state.data[key]
elseif not public then
return _G[key]
end end
end end
end end
env_mt = {__metatable=false, __index=index()}
function env_mt.__newindex(self, key, value, state) state=_state[self] declarator_mt = {__metatable=false}
do
local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, dynamic=DYNAMIC, property=PROPERTY}
local COMPATIBLE = {private=MUTABLE+PROPERTY, public=DYNAMIC+PROPERTY, mutable=PRIVATE, dynamic=PUBLIC+PROPERTY, property=PUBLIC}
function declarator_mt:__index(key, state) state=_state[self]
if state.property then declaration_error() end
local modifiers, modifier, compatible = state[self], MODIFIER[key], COMPATIBLE[key]
if not modifier then modifier, compatible, state.property = PROPERTY, PUBLIC, key end
if mask(compatible, modifiers) ~= modifiers then declaration_error() end
state[self] = modifiers + modifier
return self
end
end
do
function declarator_mt:__newindex(key, value, state) state=_state[self]
local property, modifiers; property, modifiers, state[self] = state.property, state[self], PRIVATE
if property then key, value, state.property = property, {[key]=value}, nil end
declare(state, modifiers, key, value)
end
function declarator_mt:__call(value, state) state=_state[self]
local property, modifiers; property, modifiers, state[self] = state.property, state[self], PRIVATE
if property then state.property = nil; declare(state, modifiers, property, value) else state.modifiers = modifiers end
end
end
env_mt = {__metatable=false}
function env_mt:__index(key, state) state=_state[self]
if mask(PROPERTY, state.metadata[key] or 0) ~= 0 then
return state.getters[key]()
else
local value = state.data[key]
if value ~= nil then return value else return _G[key] end
end
end
function env_mt:__newindex(key, value, state) state=_state[self]
local modifiers = state.metadata[key] local modifiers = state.metadata[key]
if modifiers then if modifiers then
if mask(PROPERTY, modifiers) ~= 0 then if mask(PROPERTY, modifiers) ~= 0 then
@@ -98,30 +108,47 @@ do
declare(state, state.modifiers, key, value) declare(state, state.modifiers, key, value)
end end
end end
interface_mt = {__metatable=false, __index=index(true)} end
function interface_mt.__newindex(self, key, value, state) state=_state[self]
local modifiers = state.metadata[key] interface_mt = {__metatable=false}
if modifiers then function interface_mt:__index(key, state) state=_state[self]
if mask(PUBLIC+PROPERTY, modifiers) == PUBLIC+PROPERTY then local masked = mask(PUBLIC+PROPERTY, state.metadata[key] or 0)
return state.setters[key](value) if masked == PUBLIC+PROPERTY then
elseif mask(PUBLIC, modifiers) ~= 0 then return state.getters[key]()
return state.data[key](value) elseif masked == PUBLIC then
end return state.data[key]
end
end
function interface_mt:__newindex(key, value, state) state=_state[self]
local modifiers = state.metadata[key]
if modifiers then
if mask(PUBLIC+PROPERTY, modifiers) == PUBLIC+PROPERTY then
return state.setters[key](value)
elseif mask(PUBLIC, modifiers) ~= 0 then
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, getters, env, interface, declarator, importer local state, 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)
getters = {
private=function() state[declarator]=state.modifiers; return declarator.private end, public=function() state[declarator]=state.modifiers; return declarator.public end,
mutable=function() state[declarator]=state.modifiers; return declarator.mutable end, property=function() state[declarator]=state.modifiers; return declarator.property end,
}
state = { state = {
env=env, interface=interface, modifiers=PRIVATE, env = env,
metadata = {_=MUTABLE, _G=PRIVATE, M=PRIVATE, error=PRIVATE, import=PRIVATE, private=PROPERTY, public=PROPERTY, mutable=PROPERTY, property=PROPERTY}, interface = interface,
data = {_G=_G, M=env, error=error, import=importer}, getters=getters, setters={}, modifiers = PRIVATE,
metadata = {_=PROPERTY, _G=PRIVATE, M=PRIVATE, error=PRIVATE, import=PRIVATE, private=PROPERTY, public=PROPERTY, mutable=PROPERTY, dynamic=PROPERTY, property=PROPERTY},
data = {_G=_G, M=env, error=error, import=importer},
getters = {
_ = pass,
private = function() state[declarator] = PRIVATE; return declarator end,
public = function() state[declarator] = PUBLIC; return declarator end,
mutable = function() state[declarator] = MUTABLE; return declarator end,
dynamic = function() state[declarator] = DYNAMIC; return declarator end,
property = function() state[declarator] = PROPERTY; return declarator end,
},
setters = {_=pass, private=pass, public=pass, mutable=pass, dynamic=pass, property=pass},
} }
_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' -- TODO importer [''] 'core' -- TODO
tabs/search/filter.lua
+2 -2
View File
@@ -72,14 +72,14 @@ function update_form()
end end
if blizzard_query.exact then if blizzard_query.exact then
for key in -temp-set('class', 'subclass', 'slot', 'quality') do for _, key in -temp-list('class', 'subclass', 'slot', 'quality') do
M[key..'_dropdown'].button:Disable() M[key..'_dropdown'].button:Disable()
end end
else else
class_dropdown.button:Enable() class_dropdown.button:Enable()
quality_dropdown.button:Enable() quality_dropdown.button:Enable()
end end
for key in -temp-set('min_level', 'max_level') do for _, key in -temp-list('min_level', 'max_level') do
if blizzard_query.exact then if blizzard_query.exact then
M[key..'_input']:Disable() M[key..'_input']:Disable()
else else
util/core.lua
+8
View File
@@ -64,6 +64,14 @@ function public.index(t, ...) temp=arg
return t return t
end end
function public.set(...) temp=arg
local t = t
for i=1,arg.n do
t[arg[i]] = true
end
return t
end
public.huge = 1.8*10^308 public.huge = 1.8*10^308
function public.modified.get() return IsShiftKeyDown() or IsControlKeyDown() or IsAltKeyDown() end function public.modified.get() return IsShiftKeyDown() or IsControlKeyDown() or IsAltKeyDown() end
util/filter.lua
+3 -3
View File
@@ -208,7 +208,7 @@ public.filters = {
function operator(str) function operator(str)
local operator = str == 'not' and -list('operator', 'not', 1) local operator = str == 'not' and -list('operator', 'not', 1)
for name in -set('and', 'or') do for _, name in -temp-list('and', 'or') do
for arity in present(select(3, strfind(str, '^'..name..'(%d*)$'))) do for arity in present(select(3, strfind(str, '^'..name..'(%d*)$'))) do
arity = tonumber(arity) arity = tonumber(arity)
operator = not (arity and arity < 2) and -list('operator', name, arity) operator = not (arity and arity < 2) and -list('operator', name, arity)
@@ -229,7 +229,7 @@ do
end end
for number in present(tonumber(select(3, strfind(str, '^(%d+)$')))) do for number in present(tonumber(select(3, strfind(str, '^(%d+)$')))) do
if number >= 1 and number <= 60 then if number >= 1 and number <= 60 then
for filter in -temp-set('min_level', 'max_level') do for _, filter in -temp-list('min_level', 'max_level') do
if not self[filter] then if not self[filter] then
self[filter] = {str, number} self[filter] = {str, number}
return true return true
@@ -517,7 +517,7 @@ function blizzard_query(components)
query.slot = slot_index query.slot = slot_index
query.quality = item_info.quality query.quality = item_info.quality
else else
for key in -temp-set('min_level', 'max_level', 'class', 'subclass', 'slot', 'usable', 'quality') do for _, key in -temp-list('min_level', 'max_level', 'class', 'subclass', 'slot', 'usable', 'quality') do
query[key] = index(filters[key], 2) query[key] = index(filters[key], 2)
end end
end end