big refactoring

This commit is contained in:
Manuel Simon Hirsig
2016-08-21 17:46:46 +02:00
parent 400d97a4d1
commit 568c0fb353
2 changed files with 38 additions and 26 deletions
+37 -25
View File
@@ -2,37 +2,49 @@ local type, setmetatable, setfenv, unpack, mask, _g = type, setmetatable, setfen
local PRIVATE, PUBLIC, MUTABLE, PROPERTY = 0, 1, 2, 4
local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, property=PROPERTY}
local MODIFIER_MASK, PROPERTY_MASK = {private=MUTABLE+PROPERTY, public=MUTABLE+PROPERTY, mutable=PRIVATE+PUBLIC}, PRIVATE+PUBLIC
local error, import, define_property, lock_mt, env_mt, interface_mt, declarator_mt
local error, declaration_error, immutable_error, collision_error, void_error, import, define_property, lock_mt, env_mt, interface_mt, declarator_mt, property_mt
lock_mt = {}
local _state, _modules = {}, setmetatable({}, lock_mt)
function error(message, level, ...) _g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), (level or 1) + 1) end
function error(message, level, ...) _g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), level + 1) end
function declaration_error(level) error('Malformed declaration.', level + 1) end
function immutable_error(key, level) error('Field "%s" is immutable.', level + 1, key) end
function collision_error(key, level) error('Field "%s" already exists.', level + 1, key) end
function void_error(key, level) error('No field "%s".', level + 1, key) end
function import(imports, t) for k, v in t do imports[type(k) == 'number' and v or k] = v end end
declarator_mt = {__metatable=false}
function define_property(self, key, t)
local state = _state[self]
for k, v in t do
if k == 'get' then
state.getters[key] = type(v) == 'function' and v or error('Getter must be function.', 3)
elseif k == 'set' or error 'Malformed declaration.' then
state.setters[key] = type(v) == 'function' and v or error('Setter must be function.', 3)
property_mt = {
__index = function(self, key)
local state = _state[self]; local modifiers = state.metadata[key]
if modifiers and mask(PROPERTY, modifiers) ~= 0 or declaration_error(2) then
state.property = key; return self
end
end,
__newindex = function(self, key, value)
local state, function_value = _state[self], type(value) == 'function'
local property, getters, setters = state.property, state.getters, state.setters
if key == 'get' then
if getters[property] then declaration_error(2) end
getters[property] = function_value and value or error('Getter must be a function.', 2)
elseif key == 'set' or declaration_error(2) then
if setters[property] then declaration_error(2) end
setters[property] = function_value and value or error('Setter must be a function.', 2)
end
end
end
}
function declarator_mt.__call() end
function declarator_mt.__index(self, key)
local state, modifier = _state[self], MODIFIER[key]
if modifier then
state.modifiers = modifier + mask(MODIFIER_MASK[key], state.modifiers)
return self
elseif state.metadata[key] then
error('Field "%s" already exists.', 2, key)
else
state.modifiers = PROPERTY + mask(PROPERTY_MASK, state.modifiers)
return function(t) define_property(self, key, t) end
elseif not state.metadata[key] or collision_error(key, 2) then
state.property, state.metadata[key] = key, PROPERTY + mask(PROPERTY_MASK, state.modifiers)
return state.property_initializer
end
end
function declarator_mt.__newindex(self, key, value)
local state = _state[self]
if state.metadata[key] then error('Field "%s" already exists.', 2, key) end
if state.metadata[key] then collision_error(key, 2) end
state.metadata[key], state.data[key], state.modifiers = state.modifiers, value, PRIVATE
end
do
@@ -43,7 +55,7 @@ do
return state.data[key]
else
local getter = state.getters[key]
if getter then return getter() else return default[key] or error('No field "%s".', 2, key) end
if getter then return getter() else return default[key] or void_error(key, 2) end
end
end
end
@@ -53,28 +65,28 @@ do
if modifiers then
local setter = state.setters[key]
if setter then return setter(value) end
if mask(MUTABLE, modifiers) == 0 then error('Field "%s" is immutable.', 2, key) end
if mask(MUTABLE, modifiers) == 0 then immutable_error(key, 2) end
else
state.metadata[key] = PRIVATE
state.metadata[key] = state.modifiers
end
state.data[key] = value
end
interface_mt = {__metatable=false, __index=index(PUBLIC, {})}
function interface_mt.__newindex(self, key, value)
local state = _state[self]; local setter, metadata = state.setters[key], state.metadata or error('No field "%s".', 2, key)
local state = _state[self]; local setter, metadata = state.setters[key], state.metadata or void_error(key, 2)
if mask(PUBLIC+PROPERTY, metadata) == PUBLIC+PROPERTY and setter then
return setter(value)
elseif mask(PUBLIC, metadata) == PUBLIC or error('Field "%s" is immutable.', 2, key) then
elseif mask(PUBLIC, metadata) == PUBLIC or immutable_error(key, 2) then
state.data[key] = value
end
end
end
function _g.aux_module(name)
if not _modules[name] then
local state, declarator, env, interface, imports
env, interface, declarator, imports = setmetatable({}, env_mt), setmetatable({}, interface_mt), setmetatable({}, declarator_mt), {}
local state, imports, env, interface, declarator, property
imports, env, interface, declarator, property = {}, setmetatable({}, env_mt), setmetatable({}, interface_mt), setmetatable({}, declarator_mt), setmetatable({}, property_mt)
state = {
name = name, env = env, interface = interface, declarator = declarator, imports = {}, declarator_state = PRIVATE,
name = name, env = env, interface = interface, imports = {}, declarator_state = PRIVATE,
metadata = setmetatable({_g=PRIVATE, _m=PRIVATE, _i=PRIVATE, import=PRIVATE, private=PROPERTY, public=PROPERTY, getter=PROPERTY, setter=PROPERTY, mutable=PROPERTY}, lock_mt),
data = {_g=_g, _m=env, _i=interface, import=function(t) import(imports, t) end},
getters = {private=function() state.modifiers = PRIVATE return declarator end, public=function() state.modifiers = PUBLIC return declarator end, mutable=function() state.modifiers = MUTABLE return declarator end},
@@ -100,7 +112,7 @@ frame:SetScript('OnEvent', function()
local import_data, import_getters, import_setters = import.data, import.getters, import.setters
if alias == '' then
for key, modifiers in import.metadata do
if metadata[key] then error('Import of "%s" failed. Conflict with field "%s"', 1, name, key) end
if metadata[key] then error('Import of "%s" failed. Name collision for "%s"', 1, name, key) end
count = count + 1
metadata[key], data[key], getters[key], setters[key] = modifiers, import_data[key], import_getters[key], import_setters[key]
end