Improved error messages when encoding invalid table

pull/6/head
rxi 2015-08-30 19:16:36 +01:00
parent a674e3ec0f
commit 9fbfcde195
1 changed files with 5 additions and 7 deletions

View File

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