util.events: Fix comparison of event_name with nil instead of false (fixes #554)

[prosody.git] / util / events.lua

diff --git a/util/events.lua b/util/events.lua
index 79de1151741a3e6f2dd0220e9ab4a0b1ebceafc9..e2943e4497f75bdda61b50ca11914e623864e6a6 100644 (file)
--- a/util/events.lua
+++ b/util/events.lua
@@ -9,17 +9,23 @@
 
 local pairs = pairs;
 local t_insert = table.insert;
+local t_remove = table.remove;
 local t_sort = table.sort;
 local setmetatable = setmetatable;
 local next = next;
 
-module "events"
+local _ENV = nil;
 
-function new()
+local function new()
+       -- Map event name to ordered list of handlers (lazily built): handlers[event_name] = array_of_handler_functions
        local handlers = {};
+       -- Array of wrapper functions that wrap all events (nil if empty)
        local global_wrappers;
+       -- Per-event wrappers: wrappers[event_name] = wrapper_function
        local wrappers = {};
+       -- Event map: event_map[handler_function] = priority_number
        local event_map = {};
+       -- Called on-demand to build handlers entries
        local function _rebuild_index(handlers, event)
                local _handlers = event_map[event];
                if not _handlers or next(_handlers) == nil then return; end
@@ -52,6 +58,9 @@ function new()
                        end
                end
        end;
+       local function get_handlers(event)
+               return handlers[event];
+       end;
        local function add_handlers(handlers)
                for event, handler in pairs(handlers) do
                        add_handler(event, handler);
@@ -118,11 +127,11 @@ function new()
                if not w then return; end
                for i = #w, 1 do
                        if w[i] == wrapper then
-                               table.remove(w, i);
+                               t_remove(w, i);
                        end
                end
                if #w == 0 then
-                       if event_name == nil then
+                       if event_name == false then
                                global_wrappers = nil;
                        else
                                wrappers[event_name] = nil;
@@ -134,6 +143,7 @@ function new()
                remove_handler = remove_handler;
                add_handlers = add_handlers;
                remove_handlers = remove_handlers;
+               get_handlers = get_handlers;
                wrappers = {
                        add_handler = add_wrapper;
                        remove_handler = remove_wrapper;
@@ -146,4 +156,6 @@ function new()
        };
 end
 
-return _M;
+return {
+       new = new;
+};