mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.json: Use util.iterators.sorted_pairs() in ordered mode

Browse source
This commit is contained in:
Matthew Wild 2018-09-21 14:35:35 +01:00
parent f38c79e95a
commit 809db57f68
1 changed files with 8 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

29
util/json.lua
View file

@ -7,10 +7,10 @@
-- --
local type = type; local type = type;
local t_insert, t_concat, t_remove, t_sort = table.insert, table.concat, table.remove, table.sort; local t_insert, t_concat, t_remove = table.insert, table.concat, table.remove;
local s_char = string.char; local s_char = string.char;
local tostring, tonumber = tostring, tonumber; local tostring, tonumber = tostring, tonumber;
local pairs, ipairs = pairs, ipairs; local pairs, ipairs, spairs = pairs, ipairs, require "util.iterators".sorted_pairs;
local next = next; local next = next;
local getmetatable, setmetatable = getmetatable, setmetatable; local getmetatable, setmetatable = getmetatable, setmetatable;
local print = print; local print = print;
@ -95,25 +95,12 @@ function tablesave(o, buffer)
if next(__hash) ~= nil or next(hash) ~= nil or next(__array) == nil then if next(__hash) ~= nil or next(hash) ~= nil or next(__array) == nil then
t_insert(buffer, "{"); t_insert(buffer, "{");
local mark = #buffer; local mark = #buffer;
if buffer.ordered then local _pairs = buffer.ordered and spairs or pairs;
local keys = {}; for k,v in _pairs(hash) do
for k in pairs(hash) do stringsave(k, buffer);
t_insert(keys, k); t_insert(buffer, ":");
end simplesave(v, buffer);
t_sort(keys); t_insert(buffer, ",");
for _,k in ipairs(keys) do
stringsave(k, buffer);
t_insert(buffer, ":");
simplesave(hash[k], buffer);
t_insert(buffer, ",");
end
else
for k,v in pairs(hash) do
stringsave(k, buffer);
t_insert(buffer, ":");
simplesave(v, buffer);
t_insert(buffer, ",");
end
end end
if next(__hash) ~= nil then if next(__hash) ~= nil then
t_insert(buffer, "\"__hash\":["); t_insert(buffer, "\"__hash\":[");