refactoring

2016-08-26 11:38:51 +02:00
parent 98eaa48480
commit edce5c7041
2 changed files with 48 additions and 42 deletions
@@ -1,10 +1,10 @@
 if module then return end
 local type, setmetatable, setfenv, unpack, next, intersection, union, pcall, _G = type, setmetatable, setfenv, unpack, next, bit.band, bit.bor, pcall, getfenv(0)
 local error, import_error, declaration_error, collision_error, mutability_error
-local pass, start_declaration, advance_declaration, env_mt, interface_mt, metadata_mt, property_mt
+local noop, start_declaration, advance_declaration, env_mt, interface_mt, property_mt

 local PRIVATE, PUBLIC, MUTABLE, PROPERTY = 0, 1, 2, 4
-local INDEX, NEWINDEX, CALL = 1, 2, 4
+local INDEX, NEWINDEX, CALL = 1, 2, 3
 local _state = {}

 function error(message, ...)
@@ -15,7 +15,7 @@ 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
+noop = function() end

 do
 	local function unpack_property_value(t)
@@ -28,7 +28,7 @@ do
 		local metadata = state.metadata
 		metadata[key] = metadata[key] and collision_error(key) or modifiers
 		if intersection(PROPERTY, modifiers) == 0 then
-			state.data[key] = value
+			state.fields[key] = value
 		else
 			local success, getter, setter = pcall(unpack_property_value, value)
 			if success or declaration_error() then
@@ -37,6 +37,7 @@ do
 		end
 	end

+	advance_declaration = noop
 	do
 		local MODIFIER = {private=PRIVATE, public=PUBLIC, mutable=MUTABLE, property=PROPERTY}
 		local state, modifiers, property
@@ -49,16 +50,16 @@ do
 			elseif type == NEWINDEX then
 				if property then key, value = property, {[key]=value} end
 				declare(state, union(modifiers, state.modifiers), key, value)
-				advance_declaration = pass
+				advance_declaration = noop
 				return true
 			elseif type == CALL then
 				if property then declare(state, union(modifiers, state.modifiers), property, value) else state.modifiers = modifiers end
-				advance_declaration = pass
+				advance_declaration = noop
 				return true
 			end
 		end
 		function start_declaration(state, modifier)
-			if advance_declaration ~= pass then declaration_error() end
+			if advance_declaration ~= noop then declaration_error() end
 			advance_declaration, state, modifiers, property = intercept, state, modifier, nil
 		end
 	end
@@ -69,7 +70,7 @@ do
 		if intersection(PROPERTY, state.metadata[key] or 0) ~= 0 then
 			return state.getters[key]()
 		else
-			local value = state.data[key]
+			local value = state.fields[key]
 			if value ~= nil then return value else return _G[key] end
 		end
 	end
@@ -80,7 +81,7 @@ do
 			if intersection(PROPERTY, modifiers) ~= 0 then
 				state.setters[key](value)
 			elseif intersection(MUTABLE, modifiers) ~= 0 or mutability_error(key) then
-				state.data[key] = value
+				state.fields[key] = value
 			end
 		else
 			declare(state, state.modifiers, key, value)
@@ -97,41 +98,42 @@ function interface_mt:__index(key, state) state=_state[self]
 	if masked == PUBLIC+PROPERTY then
 		return state.getters[key]()
 	elseif masked == PUBLIC then
-		return state.data[key]
+		return state.fields[key]
 	end
 end
 function interface_mt:__newindex(key, value, state) state=_state[self]
 	if intersection(PUBLIC+PROPERTY, state.metadata[key] or 0) == PUBLIC+PROPERTY then
 		return state.setters[key](value)
--	elseif masked == PUBLIC and type(state.data[key]) == 'function' then
--		return state.data[key](value)
+--	elseif masked == PUBLIC and type(state.fields[key]) == 'function' then
+--		return state.fields[key](value)
 	end
 end

-property_mt = {__index=function() return pass end}
+property_mt = {__index=function() return noop end}

-local function module(...)
+function module(...)
 	local state, env, interface
 	env, interface = setmetatable({}, env_mt), setmetatable({}, interface_mt)
 	state = {
-		metadata = {_=PROPERTY, error=PRIVATE, pass=PRIVATE, _G=PRIVATE, M=PRIVATE, I=PRIVATE, private=PROPERTY, public=PROPERTY, mutable=PROPERTY, property=PROPERTY},
+		metadata = {_=PROPERTY, error=PRIVATE, noop=PRIVATE, _G=PRIVATE, M=PRIVATE, I=PRIVATE, private=PROPERTY, public=PROPERTY, mutable=PROPERTY, property=PROPERTY},
 		fields = {_G=_G, M=env, I=interface, error=error},
 		getters = setmetatable({
-			private = function() start_declaration(PRIVATE, state); return env end,
-			public = function() start_declaration(PUBLIC, state); return env end,
-			mutable = function() start_declaration(MUTABLE, state); return env end,
-			property = function() start_declaration(PROPERTY, state); return env end,
+			private = function() start_declaration(state, PRIVATE); return env end,
+			public = function() start_declaration(state, PUBLIC); return env end,
+			mutable = function() start_declaration(state, MUTABLE); return env end,
+			property = function() start_declaration(state, PROPERTY); return env end,
 		}, property_mt),
 		setters = setmetatable({}, property_mt),
+		modifiers = PRIVATE,
 	}
 	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 intersection(PUBLIC, v) ~= 0 and (not state.metadata[k] or import_error()) then
-				state.metadata[k], state.data[k], state.getters[k], state.setters[k] = v, module.data[k], module.getters[k], module.setters[k]
+				state.metadata[k], state.fields[k], state.getters[k], state.setters[k] = v, module.fields[k], module.getters[k], module.setters[k]
 			end
 		end
 	end
-	state[env], state[interface] = state, state
+	_state[env], _state[interface] = state, state
 	setfenv(2, env)
 end