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-09-06 03:07:01 +02:00
parent 534a1874b0
commit 1a40dd1d47
7 changed files with 99 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
control.lua
+3 -3
View File
@@ -81,10 +81,10 @@ function public.wait(k, ...) temp=arg
end
end
function public.when(p, k, ...) temp=arg
if p() then
function public.when(c, k, ...) temp=arg
if c() then
return k(unpack(arg))
else
return wait(when, p, k, unpack(arg))
return wait(when, c, k, unpack(arg))
end
end
libs/green_t.lua
+68 -73
View File
@@ -5,10 +5,11 @@ local next, setn, type, setmetatable = next, table.setn, type, setmetatable
local wipe, release, acquire, acquire_temp, empty
-- TODO mandatory operation table mandate + comply/fulfill functions
local pool, pool_size, overflow_pool, auto_release = {}, 0, setmetatable({}, {__mode='k'}), {}
local pool, pool_size, overflow_pool, auto_release = {}, 0, setmetatable({}, { __mode='k' }), {}
CreateFrame('Frame'):SetScript('OnUpdate', function()
for t in auto_release do release(t) end; wipe(auto_release)
for t in auto_release do release(t) end
wipe(auto_release)
end)
function wipe(t)
@@ -33,7 +34,11 @@ end
public.release = release
function public.ret(t)
if getn(t) > 0 then return tremove(t, 1), ret(t) else release(t) end
if getn(t) > 0 then
return tremove(t, 1), ret(t)
else
release(t)
end
end
function acquire()
@@ -42,29 +47,40 @@ function acquire()
return pool[pool_size + 1]
end
local t = next(overflow_pool)
if t then overflow_pool[t] = nil; return t end
if t then
overflow_pool[t] = nil
return t
end
return {}
end
public.t.get = acquire
function acquire_temp() local t = acquire(); auto_release[t] = true; return t end
function acquire_temp()
local t = acquire()
auto_release[t] = true
return t
end
public.tt.get = acquire_temp
do local mt = {__newindex=nop}
do
local mt = { __newindex=nop }
function empty() return setmetatable(acquire_temp(), mt) end
public.empty.get = empty
end
do local f = function(_, v) if type(v) == 'table' then auto_release[v] = true end return v end
local mt = {__call=f, __sub=f}
do
local f = function(_, v) if type(v) == 'table' then auto_release[v] = true end return v end
local mt = { __call=f, __sub=f }
public.temp {get=function() return setmetatable(acquire_temp(), mt) end, set=function(t) auto_release[t] = true end}
end
do local f = function(_, v) if type(v) == 'table' then auto_release[v] = nil end return v end
local mt = {__call=f, __sub=f}
public.perm {get=function() return setmetatable(acquire_temp(), mt) end, set=function(t) auto_release[t] = nil end}
do
local f = function(_, v) if type(v) == 'table' then auto_release[v] = nil end return v end
local mt = { __call=f, __sub=f }
public.perm { get=function() return setmetatable(acquire_temp(), mt) end, set=function(t) auto_release[t] = nil end }
end
do local mt, key = {}, nil
do
local mt, key = {}, nil
function mt:__unm() local temp = mt.__index; mt.__index = nil; return temp end
function mt:__index(k) key = k; return self end
function mt:__call(v) self[key] = v; key = nil return self end
@@ -79,64 +95,6 @@ local function arg_chunk(k, n)
return str
end
--local function insert_chunk(mode)
-- local body = 'repeat '
-- if mode == 'k' then
-- for i = 2, 99 do
-- body = body .. format('if a%1$d == nil then break end; a1[a%1$d] = true;', i)
-- end
-- elseif mode == 'v' then
-- body = body .. 'if a2 == nil then break end; a1[1] = a2;'
-- for i = 3, 99 do
-- body = body .. format('if a%1$d == nil then setn(a1, %d); break end; a1[%d] = a%1$d;', i, i-2, i-1)
-- end
-- elseif mode == 'v0' then
-- body = body .. 'setn(a1, 98);'
-- for i = 2, 99 do
-- body = body .. format('a1[%d] = a%d;', i-1, i)
-- end
-- elseif mode == 'kv' then
-- for i = 2, 98, 2 do
-- body = body .. format('if a%1$d == nil then break end; a1[a%1$d] = a%d;', i, i+1)
-- end
-- end
-- return body .. 'if a100 ~= nil then error"Overflow." end until false;'
--end
do local function constructor(type)
local chunk = 'local setn, error = table.setn, error; return function('
for i = 1, 99 do chunk = chunk .. 'a' .. i..',' end
chunk = chunk .. 'overflow) local t = t'
if type == 'set' then
for i = 1, 99 do chunk = format('%s; if a%d == nil then return t end; t[a%d] = true', chunk, i, i) end
elseif type == 'array' then
chunk = chunk .. '; setn(t, 99); if a1 == nil then return t end; t[1] = a1'
for i = 2, 99 do chunk = format('%s; if a%d == nil then setn(t, %d); return t end; t[%d] = a%d', chunk, i, i - 1, i, i) end
elseif type == 'array0' then
chunk = chunk .. '; setn(t, 99)'
for i = 1, 99 do chunk = format('%s; t[%d] = a%d', chunk, i, i) end
elseif type == 'table' then
for i = 1, 97, 2 do chunk = format('%s; if a%d == nil then return t end; t[a%d] = a%d', chunk, i, i, i + 1) end
end
chunk = chunk .. '; return (overflow == nil or error "Overflow.") and t end'
local f = loadstring(chunk); setfenv(f, M); return f()
end
public(); S, A, A0, T = constructor'set', constructor'array', constructor 'array0', constructor 'table'
end
--do
-- local function pseudo_literal(mode)
-- local upvals = {setmetatable=setmetatable, setn=table.setn, error=error}
-- local mt = {__call = pseudo_vararg_function(insert_chunk(mode) .. 'setmetatable(a1, nil); return a1', upvals)}
-- return function() return setmetatable(acquire(), mt) end
-- end
-- public.S.get = pseudo_literal'k'
-- public.A.get = pseudo_literal'v'
-- public.A0.get = pseudo_literal'v0'
-- public.T.get = pseudo_literal'kv'
--end
function public.pseudo_vararg_function(body, upvals)
local upval_chunk = ''
for k in upvals or empty() do
@@ -147,10 +105,47 @@ function public.pseudo_vararg_function(body, upvals)
return f()
end
local function insert_chunk(mode)
local body = 'repeat '
if mode == 'k' then
for i = 2, 99 do
body = body .. format('if a%1$d == nil then break end; a1[a%1$d] = true;', i)
end
elseif mode == 'v' then
body = body .. 'if a2 == nil then break end; a1[1] = a2;'
for i = 3, 99 do
body = body .. format('if a%1$d == nil then setn(a1, %d); break end; a1[%d] = a%1$d;', i, i-2, i-1)
end
elseif mode == 'v0' then
body = body .. 'setn(a1, 98);'
for i = 2, 99 do
body = body .. format('a1[%d] = a%d;', i-1, i)
end
elseif mode == 'kv' then
for i = 2, 98, 2 do
body = body .. format('if a%1$d == nil then break end; a1[a%1$d] = a%d;', i, i+1)
end
end
return body .. 'if a100 ~= nil then error"Overflow." end until true;'
end
do
local function pseudo_literal(mode)
local upvals = {setmetatable=setmetatable, setn=table.setn, error=error}
local mt = {__call = pseudo_vararg_function(insert_chunk(mode) .. 'setmetatable(a1, nil); return a1', upvals)}
return function() return setmetatable(acquire(), mt) end
end
public.S.get = pseudo_literal'k'
public.A.get = pseudo_literal'v'
public.A0.get = pseudo_literal'v0'
public.T.get = pseudo_literal'kv'
end
do
local body = ''
for i = 2, 100 do
body = body .. format('if a1 == %d then return %s end;', i, arg_chunk(i-1, 100))
for i = 1, 99 do
body = body .. format('if a1 == %d then return %s end;', i, arg_chunk(i+1, 100))
end
public.select = pseudo_vararg_function(body)
end
end
libs/inspect.lua
+17 -7
View File
@@ -35,16 +35,26 @@ function inspect(_, ...)
return unpack(arg)
end
local function setting(v)
if type(v) == 'number' then
depth = v
elseif type(v) == 'function' then
print('#' .. v())
else
print('#' .. v)
end
end
local mt = { __metatable=false, __call=inspect, __div=inspect }
function mt:__index(key)
if type(key) == 'number' then
depth = key
elseif type(key) == 'function' then
print('#' .. key())
else
print('#' .. key)
end
setting(key)
return self
end
function mt:__newindex(key, value)
setting(key)
self(value)
return self
end
tabs/post/core.lua
+2 -2
View File
@@ -75,8 +75,8 @@ function set_unit_start_price(amount)
end
function get_unit_buyout_price()
local money_text = p/unit_buyout_price:GetText()
return p/aux.money.from_string(money_text) or 0
local money_text = unit_buyout_price:GetText()
return aux.money.from_string(money_text) or 0
end
function set_unit_buyout_price(amount)
tabs/post/frame.lua
-4
View File
@@ -224,7 +224,6 @@ function create_frames()
editbox.change = function() refresh = true end
editbox.enter = function() this:ClearFocus() end
editbox.focus_loss = function()
p = this.SetText
this:SetText(money.to_string(get_unit_start_price(), true, nil, 3, nil, true))
end
do
@@ -261,7 +260,6 @@ function create_frames()
editbox.change = function() refresh = true end
editbox.enter = function() this:ClearFocus() end
editbox.focus_loss = function()
p(this.SetText)
this:SetText(money.to_string(get_unit_buyout_price(), true, nil, 3, nil, true))
end
do
@@ -277,8 +275,6 @@ function create_frames()
buyout_price_percentage = label
end
unit_buyout_price = editbox
local o = editbox.SetText
function editbox:SetText(v) p(v) o(self, v) end
end
do
local btn = gui.button(frame.parameters, 14)
util/core.lua
+8 -8
View File
@@ -157,10 +157,10 @@ function public.eq(t1, t2)
return true
end
function public.any(t, p)
function public.any(t, predicate)
for _, v in t do
if p then
if p(v) then return true end
if predicate then
if predicate(v) then return true end
elseif v then
return true
end
@@ -168,10 +168,10 @@ function public.any(t, p)
return false
end
function public.all(t, p)
function public.all(t, predicate)
for _, v in t do
if p then
if not p(v) then return false end
if predicate then
if not predicate(v) then return false end
elseif not v then
return false
end
@@ -179,9 +179,9 @@ function public.all(t, p)
return true
end
function public.filter(t, p)
function public.filter(t, predicate)
for k, v in t do
if not p(v, k) then t[k] = nil end
if not predicate(v, k) then t[k] = nil end
end
return t
end
util/money.lua
+1 -1
View File
@@ -6,8 +6,8 @@ SILVER_TEXT = '|cffc7c7cfs|r'
COPPER_TEXT = '|cffeda55fc|r'
private()
COPPER_PER_SILVER = 100
COPPER_PER_GOLD = 10000
COPPER_PER_SILVER = 100
function public.to_gsc(money)
local gold = floor(money / COPPER_PER_GOLD)