comparison util/helpers.lua @ 8412:0ea1e95b3a11

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 22 Nov 2017 02:36:10 +0100
parents a9e8523a5e73
children ad89e3cc67b6
comparison
equal deleted inserted replaced
8410:54ff1f91e4db 8412:0ea1e95b3a11
48 if handlers and (event == specific_event or not specific_event) then 48 if handlers and (event == specific_event or not specific_event) then
49 table.insert(events_array, event); 49 table.insert(events_array, event);
50 local handler_strings = {}; 50 local handler_strings = {};
51 for i, handler in ipairs(handlers) do 51 for i, handler in ipairs(handlers) do
52 local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler)); 52 local upvals = debug.string_from_var_table(debug.get_upvalues_table(handler));
53 handler_strings[i] = " "..priorities[handler]..": "..tostring(handler)..(upvals and ("\n "..upvals) or ""); 53 handler_strings[i] = " "..(priorities[handler] or "?")..": "..tostring(handler)..(upvals and ("\n "..upvals) or "");
54 end 54 end
55 event_handler_arrays[event] = handler_strings; 55 event_handler_arrays[event] = handler_strings;
56 end 56 end
57 end 57 end
58 table.sort(events_array); 58 table.sort(events_array);