From 2fe6ff2556b4b9ce9bb1ce47c85098fdeba56683 Mon Sep 17 00:00:00 2001
From: Manuel Simon Hirsig <simon.hirsig@gmail.com>
Date: Sun, 21 Aug 2016 10:22:15 +0200
Subject: [PATCH] big refactoring

---
 init.lua   | 15 +++++++++------
 module.lua | 22 ++++++++++++----------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/init.lua b/init.lua
index 52f854c..7e328c2 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,5 @@
 local aux_module, getn, setn, tinsert, tremove, getfenv, setfenv, gfind = aux_module, getn, table.setn, tinsert, tremove, getfenv, setfenv, string.gfind
-setfenv(1, aux_module '/core')
-
+aux = aux_module 'core'
 public.version = '5.0.0'
 
 do
@@ -25,12 +24,16 @@ do
 end
 
 do
+	local modules = {}
+	local function module_env(name) aux_module(name) return getfenv() end
 	function public.module(name)
-		local env, interface = aux_module(name)
-		env.import(temp-{'modules', 'core', 'util'})
-		setfenv(2, parent)
+		local env = module_env(name)
+		if not modules[name] then
+			env.import(temp-{modules='', core='', util=''})
+		end
+		setfenv(2, env)
+		modules[name] = true
 	end
-	g.aux = module 'core'
 end
 
 local event_frame = CreateFrame 'Frame'
diff --git a/module.lua b/module.lua
index 1b70075..179c184 100644
--- a/module.lua
+++ b/module.lua
@@ -1,13 +1,13 @@
 local type, setmetatable, unpack, mask, g = type, setmetatable, unpack, bit.band, getfenv(0)
-local PRIVATE, PUBLIC, MUTABLE, GETTER, SETTER = 0, 1, 2, 4, 8
-local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, getter=GETTER, setter=SETTER}
-local MASK = {private=MUTABLE+GETTER+SETTER, public=MUTABLE+GETTER+SETTER, mutable=PRIVATE+PUBLIC, getter=PRIVATE+PUBLIC+SETTER, setter=PRIVATE+PUBLIC+GETTER}
+local PRIVATE, PUBLIC, GETTER, SETTER, MUTABLE = 0, 1, 2, 4, 8
+local MODIFIER = {private=PRIVATE, public=PUBLIC, getter=GETTER, setter=SETTER, mutable=MUTABLE}
+local MASK = {private=MUTABLE+GETTER+SETTER, public=MUTABLE+GETTER+SETTER, getter=PRIVATE+PUBLIC+SETTER, setter=PRIVATE+PUBLIC+GETTER, mutable=PRIVATE+PUBLIC}
 local import, declarator_mt, env_mt, interface_mt, lock_mt
 local initialize_declarator, error
 local _modules, _metadata, _data, _getters, _setters, _imports, _declarators, _declarator_state = setmetatable({}, lock_mt), {}, {}, {}, {}, {}, {}, {}
 function error(message, ...) g.error(format(message, unpack(arg))..'\n'..debugstack(3, 5, 0), 3) 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 }
+declarator_mt = {__metatable=false}
 do
 	local function define_property(self, key, t)
 		local getter, setter = t.get, t.set
@@ -71,12 +71,12 @@ function g.aux_module(name)
 	if not _modules[name] then
 		local metadata, data, getters, setters, imports, declarator, env, interface
 		imports, declarator, env, interface = {}, setmetatable({}, declarator_mt), setmetatable({}, env_mt), setmetatable({}, interface_mt)
-		metadata = setmetatable({g=PRIVATE, m=PRIVATE, import=PRIVATE, private=GETTER, public=GETTER, mutable=GETTER, getter=GETTER, setter=GETTER}, lock_mt)
+		metadata = setmetatable({g=PRIVATE, m=PRIVATE, import=PRIVATE, private=GETTER, public=GETTER, getter=GETTER, setter=GETTER, mutable=GETTER}, lock_mt)
 		data = {g=g, m=env, import=function(t) import(imports, t) end}
 		getters = {
 			private=function() _declarator_state[declarator] = PRIVATE return declarator end, public=function() _declarator_state[declarator] = PUBLIC return declarator end,
-			mutable=function() _declarator_state[declarator] = PUBLIC return declarator end,
-			getter=function() _declarator_state[declarator] = PUBLIC return declarator end, setter=function() _declarator_state[declarator] = PUBLIC return declarator end,
+			getter=function() _declarator_state[declarator] = GETTER return declarator end, setter=function() _declarator_state[declarator] = SETTER return declarator end,
+			mutable=function() _declarator_state[declarator] = MUTABLE return declarator end,
 		}
 		setters = {}
 		_metadata[name], _metadata[declarator], _metadata[env], _metadata[interface] = metadata, metadata, metadata, metadata
@@ -85,7 +85,9 @@ function g.aux_module(name)
 		_setters[name], _setters[declarator], _setters[env], _setters[interface] = setters, setters, setters, setters
 		_modules[name], _imports[name], _declarators[name] = {env, interface}, imports, declarator
 	end
-	return unpack(_modules[name])
+	local env, interface = unpack(_modules[name])
+	setfenv(2, env)
+	return interface
 end
 local frame = CreateFrame 'Frame'
 frame:RegisterEvent 'PLAYER_LOGIN'
@@ -97,7 +99,7 @@ frame:SetScript('OnEvent', function()
 		local declarator = _declarators[name]
 		for import, v in _imports[name] do
 			if not _modules[import] then error('Invalid import "%s" in module "%s".', import, name) end
-			if v == true then
+			if v == '' then
 				local data = _data[import]
 				for key, modifiers in _metadata[import] do
 					if mask(PUBLIC, modifiers) ~= 0 then
@@ -107,7 +109,7 @@ frame:SetScript('OnEvent', function()
 					end
 				end
 			else
-
+				declarator[v] = import
 			end
 		end
 	end