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

util.json: Variable renaming to avoid shadowing [luacheck]

Browse source
This commit is contained in:
Matthew Wild 2016-03-10 17:53:17 +00:00
parent cae49b6891
commit bd3767353f
1 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
util/json.lua
View file

@ -19,10 +19,10 @@ local has_array, array = pcall(require, "util.array");
local array_mt = has_array and getmetatable(array()) or {}; local array_mt = has_array and getmetatable(array()) or {};
--module("json") --module("json")
local json = {}; local module = {};
local null = setmetatable({}, { __tostring = function() return "null"; end; }); local null = setmetatable({}, { __tostring = function() return "null"; end; });
json.null = null; module.null = null;
local escapes = { local escapes = {
["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b", ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b",
@ -69,7 +69,7 @@ end
function arraysave(o, buffer) function arraysave(o, buffer)
t_insert(buffer, "["); t_insert(buffer, "[");
if next(o) then if next(o) then
for i,v in ipairs(o) do for _, v in ipairs(o) do
simplesave(v, buffer); simplesave(v, buffer);
t_insert(buffer, ","); t_insert(buffer, ",");
end end
@ -164,17 +164,17 @@ function simplesave(o, buffer)
end end
end end
function json.encode(obj) function module.encode(obj)
local t = {}; local t = {};
simplesave(obj, t); simplesave(obj, t);
return t_concat(t); return t_concat(t);
end end
function json.encode_ordered(obj) function module.encode_ordered(obj)
local t = { ordered = true }; local t = { ordered = true };
simplesave(obj, t); simplesave(obj, t);
return t_concat(t); return t_concat(t);
end end
function json.encode_array(obj) function module.encode_array(obj)
local t = {}; local t = {};
arraysave(obj, t); arraysave(obj, t);
return t_concat(t); return t_concat(t);
@ -190,7 +190,7 @@ local function _fixobject(obj)
local __array = obj.__array; local __array = obj.__array;
if __array then if __array then
obj.__array = nil; obj.__array = nil;
for i,v in ipairs(__array) do for _, v in ipairs(__array) do
t_insert(obj, v); t_insert(obj, v);
end end
end end
@ -198,7 +198,7 @@ local function _fixobject(obj)
if __hash then if __hash then
obj.__hash = nil; obj.__hash = nil;
local k; local k;
for i,v in ipairs(__hash) do for _, v in ipairs(__hash) do
if k ~= nil then if k ~= nil then
obj[k] = v; k = nil; obj[k] = v; k = nil;
else else
@ -343,7 +343,7 @@ local first_escape = {
["\\u" ] = "\\u"; ["\\u" ] = "\\u";
}; };
function json.decode(json) function module.decode(json)
json = json:gsub("\\.", first_escape) -- get rid of all escapes except \uXXXX, making string parsing much simpler json = json:gsub("\\.", first_escape) -- get rid of all escapes except \uXXXX, making string parsing much simpler
--:gsub("[\r\n]", "\t"); -- \r\n\t are equivalent, we care about none of them, and none of them can be in strings --:gsub("[\r\n]", "\t"); -- \r\n\t are equivalent, we care about none of them, and none of them can be in strings
@ -356,10 +356,10 @@ function json.decode(json)
return val; return val;
end end
function json.test(object) function module.test(object)
local encoded = json.encode(object); local encoded = module.encode(object);
local decoded = json.decode(encoded); local decoded = module.decode(encoded);
local recoded = json.encode(decoded); local recoded = module.encode(decoded);
if encoded ~= recoded then if encoded ~= recoded then
print("FAILED"); print("FAILED");
print("encoded:", encoded); print("encoded:", encoded);
@ -370,4 +370,4 @@ function json.test(object)
return encoded == recoded; return encoded == recoded;
end end
return json; return module;