Bram
/
lua-json
forked from Dependencies/lua-json
1
0
Fork 0
Code Pull Requests Activity

Improved error messages when encoding invalid table

master
rxi 2015-08-30 19:16:36 +01:00
parent a674e3ec0f
commit 9fbfcde195
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
json.lua
View File

@ -54,14 +54,13 @@ local function encode_table(val, stack)
-- Treat as array -- check keys are valid and it is not sparse -- Treat as array -- check keys are valid and it is not sparse
local n = 0 local n = 0
for k in pairs(val) do for k in pairs(val) do
local t = type(k) if type(k) ~= "number" then
if t ~= "number" then error("invalid table: mixed key types")
error("unexpected key of type '" .. t .. "' in array")
end end
n = n + 1 n = n + 1
end end
if n ~= #val then if n ~= #val then
error("unexpected sparse array") error("invalid table: sparse array")
end end
-- Encode -- Encode
for i, v in ipairs(val) do for i, v in ipairs(val) do
@ -73,9 +72,8 @@ local function encode_table(val, stack)
else else
-- Treat as an object -- Treat as an object
for k, v in pairs(val) do for k, v in pairs(val) do
local t = type(k) if type(k) ~= "string" then
if t ~= "string" then error("invalid table: mixed key types")
error("unexpected key of type '" .. t .. "' in object")
end end
table.insert(res, encode(k, stack) .. ":" .. encode(v, stack)) table.insert(res, encode(k, stack) .. ":" .. encode(v, stack))
end end