krprint: order keys while pretty-printing tables

Code was copied from Lua sandbox, the old copy is to be removed once new
pretty-printer is finished.

diff --git a/daemon/lua/krprint.lua b/daemon/lua/krprint.lua
index 0f9cfc803b34fef9cb25d72a0b92c7161ef8f867..5f2db3356d3c3b2d7f70c3f68782c1f65ea0afd3 100644 (file)
--- a/daemon/lua/krprint.lua
+++ b/daemon/lua/krprint.lua
@@ -96,6 +96,31 @@ function base_class.boolean(_, val)
        return tostring(val)
 end
 
+local function ordered_iter(unordered_tt)
+       local keys = {}
+       for k in pairs(unordered_tt) do
+               table.insert(keys, k)
+       end
+       table.sort(keys,
+               function (a, b)
+                       if type(a) ~= type(b) then
+                               return type(a) < type(b)
+                       end
+                       if type(a) == 'number' then
+                               return a < b
+                       else
+                               return tostring(a) < tostring(b)
+                       end
+               end)
+       local i = 0
+       return function()
+               i = i + 1
+               if keys[i] ~= nil then
+                       return keys[i], unordered_tt[keys[i]]
+               end
+       end
+end
+
 function base_class.table(self, tab)
        assert(type(tab) == 'table')
        if self.done[tab] then
@@ -106,7 +131,7 @@ function base_class.table(self, tab)
        local items = {'{'}
        local previdx = 0
        self:indent_inc()
-       for idx, val in pairs(tab) do
+       for idx, val in ordered_iter(tab) do
                local errors, valok, valexpr, valnote, idxok, idxexpr, idxnote
                errors = {}
                valok, valexpr, valnote = pcall(self.val2expr, self, val)