scan improvements

control.lua

@@ -1,35 +1,39 @@
 Aux.control = {}
 
 local event_listeners = {}
-
 local update_listeners = {}
 
 function Aux.control.on_event()
 	for listener, _ in pairs(event_listeners) do
-		if event == listener.event then
+		if event == listener.event and not listener.deleted then
 			listener.action()
 		end
 	end
 end
 
 function Aux.control.on_update()
+	event_listeners = Aux.util.set_filter(event_listeners, function(l) return not l.deleted end)
+	update_listeners = Aux.util.set_filter(update_listeners, function(l) return not l.deleted end)
+	
 	for listener, _ in pairs(update_listeners) do
-		listener.action()
+		if not listener.deleted then
+			listener.action()
+		end
 	end
 end
 
 
 
-function Aux.control.event_listener(event, action) -- async!
+function Aux.control.event_listener(event, action)
 	local self = {}
 	
 	local listener = { event=event, action=action }
 	
-	function self:set_action(self, action)
+	function self.set_action(action)
 		listener.action = action
 	end
 	
-	function self:start(self)
+	function self.start()
 		Aux.util.set_add(event_listeners, listener)
 		if not Aux.util.any(event_listeners, function(l) return l.event == event end) then
 			AuxControlFrame:RegisterEvent(event)
@@ -37,8 +41,8 @@ function Aux.control.event_listener(event, action) -- async!
 		return self
 	end
 	
-	function self:stop(self)
-		Aux.util.set_remove(event_listeners, listener)
+	function self.stop()
+		listener.deleted = true
 		if not Aux.util.any(event_listeners, function(l) return l.event == event end) then
 			AuxControlFrame:UnregisterEvent(event)
 		end
@@ -53,84 +57,87 @@ function Aux.control.update_listener(action)
 	
 	local listener = { action=action }
 
-	function self:set_action(self, action)
+	function self.set_action(action)
 		listener.action = action
 	end
 	
-	function self:start(self)
+	function self.start()
 		Aux.util.set_add(update_listeners, listener)
 		return self
 	end
 	
-	function self:stop(self)
-		Aux.util.set_remove(update_listeners, listener)
+	function self.stop()
+		listener.deleted = true
 		return self
 	end
 	
 	return self
 end
 
-
+	
 
 function Aux.control.on_next_update(callback)
 	local listener = Aux.control.update_listener()
 	
-	listener:set_action(function()
+	listener.set_action(function()
 		listener:stop()
-		callback()
+		return callback()
 	end)
 	
-	listener:start()
+	listener.start()
+end
+
+function Aux.control.on_next_event(event, callback)
+	local listener = Aux.control.event_listener(event)
+	
+	listener.set_action(function()
+		listener:stop()
+		return callback()
+	end)
+	
+	listener.start()
 end
 
 function Aux.control.as_soon_as(p, callback)
 	local listener = Aux.control.update_listener()	
 	
-	listener:set_action(function()
+	listener.set_action(function()
 		if p() then
-			callback()
-			listener:stop()
+			listener.stop()
+			return callback()
 		end
 	end)
 	
-	listener:start()
-end
-
-function Aux.control.on_next_event(event, callback)
-	local ok
-	
-	local listener = Aux.control.event_listener(event)
-	
-	listener:set_action(function()
-		listener:stop()
-		ok = true
-	end)
-	
-	listener:start()
-	
-	Aux.control.as_soon_as(function() return ok end, callback)
+	listener.start()
 end
 
 
 
-function Aux.control.timer()
+function Aux.control.controller()
 	local self = {}
 	
-	local t_0
+	local state
 	
-	function self:start(self)
-		t_0 = GetTime()
+	local listener = Aux.control.update_listener()
+	listener.set_action(function()
+		if state and state.p() then
+			local k = state.k
+			state = nil
+			return k()
+		end
+	end)
+	listener.start()
+	
+	function self.wait(p, k)
+		state = {
+			k = k,
+			p = p,
+		}
 	end
 	
-	function self:after(self, t, callback)
-		Aux.util.as_soon_as(function() return t_0 and GetTime() - t_0 > t end, callback)
+	function self.cleanup()
+		listener.stop()
 	end
 	
 	return self
 end
-
-function Aux.control.after_time(t, callback)
-	local timer = Aux.control.timer()
-	timer:start()
-	timer:after(t, callback)
-end