Backout 7e820979fd9b (broke tests)

[prosody.git] / util / debug.lua

diff --git a/util/debug.lua b/util/debug.lua
index 52ba52d07594ce92b1092be751f59f8bd253a7a5..a78524a9c1f148158d3f2cc85971f9ef96b5994c 100644 (file)
--- a/util/debug.lua
+++ b/util/debug.lua
@@ -13,7 +13,7 @@ local termcolours = require "util.termcolours";
 local getstring = termcolours.getstring;
 local styles;
 do
-       _ = termcolours.getstyle;
+       local _ = termcolours.getstyle;
        styles = {
                boundary_padding = _("bright");
                filename         = _("bright", "blue");
@@ -22,20 +22,23 @@ do
                location         = _("yellow");
        };
 end
-module("debugx", package.seeall);
 
-function get_locals_table(level)
-       level = level + 1; -- Skip this function itself
+local function get_locals_table(thread, level)
        local locals = {};
        for local_num = 1, math.huge do
-               local name, value = debug.getlocal(level, local_num);
+               local name, value;
+               if thread then
+                       name, value = debug.getlocal(thread, level, local_num);
+               else
+                       name, value = debug.getlocal(level+1, local_num);
+               end
                if not name then break; end
                table.insert(locals, { name = name, value = value });
        end
        return locals;
 end
 
-function get_upvalues_table(func)
+local function get_upvalues_table(func)
        local upvalues = {};
        if func then
                for upvalue_num = 1, math.huge do
@@ -47,7 +50,7 @@ function get_upvalues_table(func)
        return upvalues;
 end
 
-function string_from_var_table(var_table, max_line_len, indent_str)
+local function string_from_var_table(var_table, max_line_len, indent_str)
        local var_string = {};
        local col_pos = 0;
        max_line_len = max_line_len or math.huge;
@@ -83,7 +86,7 @@ function string_from_var_table(var_table, max_line_len, indent_str)
        end
 end
 
-function get_traceback_table(thread, start_level)
+local function get_traceback_table(thread, start_level)
        local levels = {};
        for level = start_level, math.huge do
                local info;
@@ -97,27 +100,19 @@ function get_traceback_table(thread, start_level)
                levels[(level-start_level)+1] = {
                        level = level;
                        info = info;
-                       locals = not thread and get_locals_table(level+1);
+                       locals = get_locals_table(thread, level+(thread and 0 or 1));
                        upvalues = get_upvalues_table(info.func);
                };
        end
        return levels;
 end
 
-function traceback(...)
-       local ok, ret = pcall(_traceback, ...);
-       if not ok then
-               return "Error in error handling: "..ret;
-       end
-       return ret;
-end
-
 local function build_source_boundary_marker(last_source_desc)
        local padding = string.rep("-", math.floor(((optimal_line_length - 6) - #last_source_desc)/2));
        return getstring(styles.boundary_padding, "v"..padding).." "..getstring(styles.filename, last_source_desc).." "..getstring(styles.boundary_padding, padding..(#last_source_desc%2==0 and "-v" or "v "));
 end
 
-function _traceback(thread, message, level)
+local function _traceback(thread, message, level)
 
        -- Lua manual says: debug.traceback ([thread,] [message [, level]])
        -- I fathom this to mean one of:
@@ -188,8 +183,23 @@ function _traceback(thread, message, level)
        return message.."stack traceback:\n"..table.concat(lines, "\n");
 end
 
-function use()
+local function traceback(...)
+       local ok, ret = pcall(_traceback, ...);
+       if not ok then
+               return "Error in error handling: "..ret;
+       end
+       return ret;
+end
+
+local function use()
        debug.traceback = traceback;
 end
 
-return _M;
+return {
+       get_locals_table = get_locals_table;
+       get_upvalues_table = get_upvalues_table;
+       string_from_var_table = string_from_var_table;
+       get_traceback_table = get_traceback_table;
+       traceback = traceback;
+       use = use;
+};