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-26 01:52:22 +02:00
parent fcd563fa76
commit 9492775389
2 changed files with 108 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aux-addon.lua
+23 -17
View File
@@ -1,4 +1,18 @@
module 'core'
do
local modules = {core={create_module()}}
aux = setmetatable({}, {
__metatable = false,
__index = function(_, key) return modules[key][2] end,
__newindex = function() end,
__call = function(_, name)
modules[name] = modules[name] or {create_module(aux.core)}
setfenv(2, modules[name][1]())
end,
})
end
aux 'core'
public.version = '5.0.0'
do
@@ -69,7 +83,7 @@ do
set = function(t) return make_transient(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 fill(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 v1 ~= nil then tinsert(t, v1) end
if v2 ~= nil then tinsert(t, v2) end
@@ -93,26 +107,18 @@ do
if v20 ~= nil then tinsert(t, v20) end
return t
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)
if overflow ~= nil then error 'Overflow.' end
if k1 ~= nil then t[k1] = v1 end
if k2 ~= nil then t[k2] = v2 end
if k3 ~= nil then t[k3] = v3 end
if k4 ~= nil then t[k4] = v4 end
if k5 ~= nil then t[k5] = v5 end
if k6 ~= nil then t[k6] = v6 end
if k7 ~= nil then t[k7] = v7 end
if k8 ~= nil then t[k8] = v8 end
if k9 ~= nil then t[k9] = v9 end
if k10 ~= nil then t[k10] = v10 end
return t
end
local function collector_mt(f)
return {__call=f, __unm=function(self) return setmetatable(self, nil) end}
end
local object_mt = {
__newindex()
}
-- table-from(1,2,3)
local set_mt, list_mt, object_mt = collector_mt(keys), collector_mt(values), collector_mt(pairs)
modifier = public.property
public.property()
list, object = {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}
modifier = nil
private()
-- TODO or 'auto' 'transient'?
end
module.lua
+85 -61
View File
@@ -2,19 +2,12 @@ local type, setmetatable, setfenv, unpack, next, mask, combine, pcall, _G = type
local error, import_error, declaration_error, collision_error, mutability_error
local pass, env_mt, interface_mt, declarator_mt, importer_mt
module 'util' (
a,
b,
c
)
aux:module 'kek'
import: util (a, b, c)
aux.module 'kek'
from 'util' import ()
import 'util' as 'kek'
local PRIVATE, PUBLIC, MUTABLE, DYNAMIC, PROPERTY = 1, 2, 4, 8, 16
local _state, _modules = {}, {}
local NULL, PRIVATE, PUBLIC, MUTABLE, DYNAMIC, PROPERTY = 0, 1, 2, 4, 8, 16
local state, env_state = {}, {}, {}
function error(message, ...)
return _G.error(format(message or '', unpack(arg))..'\n'..debugstack(), 0)
@@ -26,33 +19,24 @@ mutability_error = function(key) error('Field "%s" is immutable.', key) end
pass = function() end
generic_function_mt = {__metatable=false}
function generic_function_mt:__call()
--function intercept_index(env, callback, state)
--
--end
--
--function intercept_newindex(env, callback, state)
--
--end
--
--function intercept_call(env, callback, state)
--
--end
--
--generic_function_mt = {__metatable=false}
--function generic_function_mt:__call(...)
-- self.
--end
end
do
importer_mt = {__metatable=false}
local function import(state, module, alias)
if alias == '' then
for key, modifiers in module.metadata do
if not state.metadata[key] and mask(PUBLIC, modifiers) ~= 0 then
state.metadata[key], state.data[key], state.getters[key], state.setters[key] = modifiers, module.data[key], module.getters[key], module.setters[key]
end
end
elseif not state.metadata[alias] then
state.metadata[alias], state.data[alias] = PRIVATE, module.interface
end
end
function importer_mt:__index(key, state) state=_state[self]
state[self] = key; return self
end
function importer_mt:__call(arg1, arg2, state) state=_state[self]
local name, alias, module; name = arg2 or arg1 or import_error()
alias, state[self] = state[self] or name, nil
return pcall(import, state, _modules[name], alias) and self or import_error()
end
end
do
local function dynamize(f)
@@ -105,7 +89,7 @@ do
env_mt = {__metatable=false}
function env_mt:__index(key, state) state=_state[self]
if state.intercept_index(key) then return end
if state.intercept_index(key) then return self end
if mask(PROPERTY, state.metadata[key] or 0) ~= 0 then
return state.getters[key]()
else
@@ -127,7 +111,7 @@ do
end
end
function env_mt:__call(key, ...)
_state[self].intercept_call(key, arg)
_state[self].intercept_call(key, arg); return self
end
end
@@ -150,29 +134,69 @@ function interface_mt:__newindex(key, value, state) state=_state[self]
end
end
end
local metadata_mt = {
__index = function() return 0 end
}
function module(name)
if not _modules[name] then
local env, interface, declarator, importer = setmetatable({}, env_mt), setmetatable({}, interface_mt), setmetatable({}, declarator_mt), setmetatable({}, importer_mt)
local state = {
env = env,
interface = interface,
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
importer [''] 'core' -- TODO
local function import(state, interface)
local module = _state[interface] or import_error()
end
local function create_module(...)
local env_state, env, interface = setmetatable({}, env_mt), setmetatable({}, interface_mt)
local state = {
env = env,
interface = interface,
modifiers = PRIVATE,
metadata = {_=PROPERTY, _G=PRIVATE, M=PRIVATE, error=PRIVATE, import=PRIVATE, private=PROPERTY, public=PROPERTY, mutable=PROPERTY, dynamic=PROPERTY, property=PROPERTY},
fields = {_G=_G, M=env, error=error},
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},
}
state[env], state[interface] = state, state
for i=1,arg.n do
local module = state[arg[i] or import_error()] or import_error()
for k, v in module.metadata do
if mask(PUBLIC, v) ~= 0 then
end
end
end
return env, interface
-- -- TODO create_env (per module call)
-- setfenv(2, _modules[name].env)
end
do
local modules = {}
function _G.module(name)
local module = modules[name]
if not module then
local submodules = {}
module = create_module()
-- local submodules = create_module()
module.metadata[name] = submodules.interface
module.metadata.module = PUBLIC
function module.fields.module(name)
local submodule = submodules[name]
if not submodule then
submodule = create_module()
submodules[name] = submodule
end
setfenv(2, submodule.env)
end
modules[name], _G[name] = module, module
end
setfenv(2, module.env)
end
-- TODO create_env (per module call)
setfenv(2, _modules[name].env)
end