Software `/` code `/` prosody

Annotate

util/json.lua @ 6270:ee2d5b2a263d

mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC API

author	Waqas Hussain <waqas20@gmail.com>
date	Thu, 05 Jun 2014 17:15:04 -0400
parent	5776:bd0ff8ae98a8
child	6785:bf1f09a5bcf7

rev	line source
5436 a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	1 -- Prosody IM
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	2 -- Copyright (C) 2008-2010 Matthew Wild
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	3 -- Copyright (C) 2008-2010 Waqas Hussain
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	4 --
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	5 -- This project is MIT/X11 licensed. Please see the
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	6 -- COPYING file in the source package for more information.
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	7 --
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	8
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	9 local type = type;
4474 b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	10 local t_insert, t_concat, t_remove, t_sort = table.insert, table.concat, table.remove, table.sort;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	11 local s_char = string.char;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	12 local tostring, tonumber = tostring, tonumber;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	13 local pairs, ipairs = pairs, ipairs;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	14 local next = next;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	15 local error = error;
5563 678867c552d1 util.json: Make setmetatable local. Waqas Hussain <waqas20@gmail.com> parents: 5562 diff changeset	16 local newproxy, getmetatable, setmetatable = newproxy, getmetatable, setmetatable;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	17 local print = print;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	18
5516 9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	19 local has_array, array = pcall(require, "util.array");
5562 a6b8fb827e2a util.json: Fix variable name typo which broke util.json when util.array was missing. Waqas Hussain <waqas20@gmail.com> parents: 5561 diff changeset	20 local array_mt = has_array and getmetatable(array()) or {};
5516 9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	21
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	22 --module("json")
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	23 local json = {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	24
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	25 local null = newproxy and newproxy(true) or {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	26 if getmetatable and getmetatable(null) then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	27 getmetatable(null).__tostring = function() return "null"; end;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	28 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	29 json.null = null;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	30
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	31 local escapes = {
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	32 ["\""] = "\\\"", ["\\"] = "\\\\", ["\b"] = "\\b",
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	33 ["\f"] = "\\f", ["\n"] = "\\n", ["\r"] = "\\r", ["\t"] = "\\t"};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	34 local unescapes = {
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	35 ["\""] = "\"", ["\\"] = "\\", ["/"] = "/",
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	36 b = "\b", f = "\f", n = "\n", r = "\r", t = "\t"};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	37 for i=0,31 do
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	38 local ch = s_char(i);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	39 if not escapes[ch] then escapes[ch] = ("\\u%.4X"):format(i); end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	40 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	41
5517 9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	42 local function codepoint_to_utf8(code)
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	43 if code < 0x80 then return s_char(code); end
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	44 local bits0_6 = code % 64;
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	45 if code < 0x800 then
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	46 local bits6_5 = (code - bits0_6) / 64;
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	47 return s_char(0x80 + 0x40 + bits6_5, 0x80 + bits0_6);
5436 a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	48 end
5517 9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	49 local bits0_12 = code % 4096;
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	50 local bits6_6 = (bits0_12 - bits0_6) / 64;
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	51 local bits12_4 = (code - bits0_12) / 4096;
9d7349bbe4d2 util.json: New, improved, fixed codepoint to UTF-8 conversion. Waqas Hussain <waqas20@gmail.com> parents: 5516 diff changeset	52 return s_char(0x80 + 0x40 + 0x20 + bits12_4, 0x80 + bits6_6, 0x80 + bits0_6);
5436 a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	53 end
a4ba5819bf50 util.json: Convert \uXXXX to UTF-8 when decoding Matthew Wild <mwild1@gmail.com> parents: 5395 diff changeset	54
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	55 local valid_types = {
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	56 number = true,
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	57 string = true,
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	58 table = true,
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	59 boolean = true
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	60 };
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	61 local special_keys = {
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	62 __array = true;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	63 __hash = true;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	64 };
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	65
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	66 local simplesave, tablesave, arraysave, stringsave;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	67
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	68 function stringsave(o, buffer)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	69 -- FIXME do proper utf-8 and binary data detection
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	70 t_insert(buffer, "\""..(o:gsub(".", escapes)).."\"");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	71 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	72
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	73 function arraysave(o, buffer)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	74 t_insert(buffer, "[");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	75 if next(o) then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	76 for i,v in ipairs(o) do
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	77 simplesave(v, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	78 t_insert(buffer, ",");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	79 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	80 t_remove(buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	81 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	82 t_insert(buffer, "]");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	83 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	84
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	85 function tablesave(o, buffer)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	86 local __array = {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	87 local __hash = {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	88 local hash = {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	89 for i,v in ipairs(o) do
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	90 __array[i] = v;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	91 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	92 for k,v in pairs(o) do
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	93 local ktype, vtype = type(k), type(v);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	94 if valid_types[vtype] or v == null then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	95 if ktype == "string" and not special_keys[k] then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	96 hash[k] = v;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	97 elseif (valid_types[ktype] or k == null) and __array[k] == nil then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	98 __hash[k] = v;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	99 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	100 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	101 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	102 if next(__hash) ~= nil or next(hash) ~= nil or next(__array) == nil then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	103 t_insert(buffer, "{");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	104 local mark = #buffer;
4474 b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	105 if buffer.ordered then
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	106 local keys = {};
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	107 for k in pairs(hash) do
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	108 t_insert(keys, k);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	109 end
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	110 t_sort(keys);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	111 for _,k in ipairs(keys) do
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	112 stringsave(k, buffer);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	113 t_insert(buffer, ":");
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	114 simplesave(hash[k], buffer);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	115 t_insert(buffer, ",");
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	116 end
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	117 else
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	118 for k,v in pairs(hash) do
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	119 stringsave(k, buffer);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	120 t_insert(buffer, ":");
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	121 simplesave(v, buffer);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	122 t_insert(buffer, ",");
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	123 end
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	124 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	125 if next(__hash) ~= nil then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	126 t_insert(buffer, "\"__hash\":[");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	127 for k,v in pairs(__hash) do
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	128 simplesave(k, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	129 t_insert(buffer, ",");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	130 simplesave(v, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	131 t_insert(buffer, ",");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	132 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	133 t_remove(buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	134 t_insert(buffer, "]");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	135 t_insert(buffer, ",");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	136 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	137 if next(__array) then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	138 t_insert(buffer, "\"__array\":");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	139 arraysave(__array, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	140 t_insert(buffer, ",");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	141 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	142 if mark ~= #buffer then t_remove(buffer); end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	143 t_insert(buffer, "}");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	144 else
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	145 arraysave(__array, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	146 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	147 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	148
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	149 function simplesave(o, buffer)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	150 local t = type(o);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	151 if t == "number" then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	152 t_insert(buffer, tostring(o));
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	153 elseif t == "string" then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	154 stringsave(o, buffer);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	155 elseif t == "table" then
5516 9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	156 local mt = getmetatable(o);
9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	157 if mt == array_mt then
9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	158 arraysave(o, buffer);
9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	159 else
9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	160 tablesave(o, buffer);
9733836629f9 util.json: Make encode(decode("[]"))=="[]". Waqas Hussain <waqas20@gmail.com> parents: 5436 diff changeset	161 end
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	162 elseif t == "boolean" then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	163 t_insert(buffer, (o and "true" or "false"));
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	164 else
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	165 t_insert(buffer, "null");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	166 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	167 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	168
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	169 function json.encode(obj)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	170 local t = {};
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	171 simplesave(obj, t);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	172 return t_concat(t);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	173 end
4474 b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	174 function json.encode_ordered(obj)
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	175 local t = { ordered = true };
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	176 simplesave(obj, t);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	177 return t_concat(t);
b08a46cf06e6 util.json: Added function encode_ordered(object). Waqas Hussain <waqas20@gmail.com> parents: 4404 diff changeset	178 end
5395 ec33d72a08b6 util.json: Add json.encode_array() (thanks B) Matthew Wild <mwild1@gmail.com> parents: 4474 diff changeset	179 function json.encode_array(obj)
ec33d72a08b6 util.json: Add json.encode_array() (thanks B) Matthew Wild <mwild1@gmail.com> parents: 4474 diff changeset	180 local t = {};
ec33d72a08b6 util.json: Add json.encode_array() (thanks B) Matthew Wild <mwild1@gmail.com> parents: 4474 diff changeset	181 arraysave(obj, t);
ec33d72a08b6 util.json: Add json.encode_array() (thanks B) Matthew Wild <mwild1@gmail.com> parents: 4474 diff changeset	182 return t_concat(t);
ec33d72a08b6 util.json: Add json.encode_array() (thanks B) Matthew Wild <mwild1@gmail.com> parents: 4474 diff changeset	183 end
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	184
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	185 -----------------------------------
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	186
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	187
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	188 local function _skip_whitespace(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	189 return json:find("[^ \t\r\n]", index) or index; -- no need to check \r\n, we converted those to \t
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	190 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	191 local function _fixobject(obj)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	192 local __array = obj.__array;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	193 if __array then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	194 obj.__array = nil;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	195 for i,v in ipairs(__array) do
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	196 t_insert(obj, v);
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	197 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	198 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	199 local __hash = obj.__hash;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	200 if __hash then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	201 obj.__hash = nil;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	202 local k;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	203 for i,v in ipairs(__hash) do
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	204 if k ~= nil then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	205 obj[k] = v; k = nil;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	206 else
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	207 k = v;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	208 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	209 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	210 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	211 return obj;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	212 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	213 local _readvalue, _readstring;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	214 local function _readobject(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	215 local o = {};
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	216 while true do
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	217 local key, val;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	218 index = _skip_whitespace(json, index + 1);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	219 if json:byte(index) ~= 0x22 then -- "\""
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	220 if json:byte(index) == 0x7d then return o, index + 1; end -- "}"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	221 return nil, "key expected";
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	222 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	223 key, index = _readstring(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	224 if key == nil then return nil, index; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	225 index = _skip_whitespace(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	226 if json:byte(index) ~= 0x3a then return nil, "colon expected"; end -- ":"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	227 val, index = _readvalue(json, index + 1);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	228 if val == nil then return nil, index; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	229 o[key] = val;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	230 index = _skip_whitespace(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	231 local b = json:byte(index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	232 if b == 0x7d then return _fixobject(o), index + 1; end -- "}"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	233 if b ~= 0x2c then return nil, "object eof"; end -- ","
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	234 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	235 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	236 local function _readarray(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	237 local a = {};
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	238 local oindex = index;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	239 while true do
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	240 local val;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	241 val, index = _readvalue(json, index + 1);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	242 if val == nil then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	243 if json:byte(oindex + 1) == 0x5d then return setmetatable(a, array_mt), oindex + 2; end -- "]"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	244 return val, index;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	245 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	246 t_insert(a, val);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	247 index = _skip_whitespace(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	248 local b = json:byte(index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	249 if b == 0x5d then return setmetatable(a, array_mt), index + 1; end -- "]"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	250 if b ~= 0x2c then return nil, "array eof"; end -- ","
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	251 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	252 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	253 local _unescape_error;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	254 local function _unescape_surrogate_func(x)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	255 local lead, trail = tonumber(x:sub(3, 6), 16), tonumber(x:sub(9, 12), 16);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	256 local codepoint = lead * 0x400 + trail - 0x35FDC00;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	257 local a = codepoint % 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	258 codepoint = (codepoint - a) / 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	259 local b = codepoint % 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	260 codepoint = (codepoint - b) / 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	261 local c = codepoint % 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	262 codepoint = (codepoint - c) / 64;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	263 return s_char(0xF0 + codepoint, 0x80 + c, 0x80 + b, 0x80 + a);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	264 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	265 local function _unescape_func(x)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	266 x = x:match("%x%x%x%x", 3);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	267 if x then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	268 --if x >= 0xD800 and x <= 0xDFFF then _unescape_error = true; end -- bad surrogate pair
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	269 return codepoint_to_utf8(tonumber(x, 16));
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	270 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	271 _unescape_error = true;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	272 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	273 function _readstring(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	274 index = index + 1;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	275 local endindex = json:find("\"", index, true);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	276 if endindex then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	277 local s = json:sub(index, endindex - 1);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	278 --if s:find("[%z-\31]") then return nil, "control char in string"; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	279 -- FIXME handle control characters
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	280 _unescape_error = nil;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	281 --s = s:gsub("\\u[dD][89abAB]%x%x\\u[dD][cdefCDEF]%x%x", _unescape_surrogate_func);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	282 -- FIXME handle escapes beyond BMP
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	283 s = s:gsub("\\u.?.?.?.?", _unescape_func);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	284 if _unescape_error then return nil, "invalid escape"; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	285 return s, endindex + 1;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	286 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	287 return nil, "string eof";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	288 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	289 local function _readnumber(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	290 local m = json:match("[0-9%.%-eE%+]+", index); -- FIXME do strict checking
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	291 return tonumber(m), index + #m;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	292 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	293 local function _readnull(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	294 local a, b, c = json:byte(index + 1, index + 3);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	295 if a == 0x75 and b == 0x6c and c == 0x6c then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	296 return null, index + 4;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	297 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	298 return nil, "null parse failed";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	299 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	300 local function _readtrue(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	301 local a, b, c = json:byte(index + 1, index + 3);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	302 if a == 0x72 and b == 0x75 and c == 0x65 then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	303 return true, index + 4;
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	304 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	305 return nil, "true parse failed";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	306 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	307 local function _readfalse(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	308 local a, b, c, d = json:byte(index + 1, index + 4);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	309 if a == 0x61 and b == 0x6c and c == 0x73 and d == 0x65 then
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	310 return false, index + 5;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	311 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	312 return nil, "false parse failed";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	313 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	314 function _readvalue(json, index)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	315 index = _skip_whitespace(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	316 local b = json:byte(index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	317 -- TODO try table lookup instead of if-else?
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	318 if b == 0x7B then -- "{"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	319 return _readobject(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	320 elseif b == 0x5B then -- "["
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	321 return _readarray(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	322 elseif b == 0x22 then -- "\""
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	323 return _readstring(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	324 elseif b ~= nil and b >= 0x30 and b <= 0x39 or b == 0x2d then -- "0"-"9" or "-"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	325 return _readnumber(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	326 elseif b == 0x6e then -- "n"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	327 return _readnull(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	328 elseif b == 0x74 then -- "t"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	329 return _readtrue(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	330 elseif b == 0x66 then -- "f"
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	331 return _readfalse(json, index);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	332 else
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	333 return nil, "value expected";
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	334 end
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	335 end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	336 local first_escape = {
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	337 ["\\\""] = "\\u0022";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	338 ["\\\\"] = "\\u005c";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	339 ["\\/" ] = "\\u002f";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	340 ["\\b" ] = "\\u0008";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	341 ["\\f" ] = "\\u000C";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	342 ["\\n" ] = "\\u000A";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	343 ["\\r" ] = "\\u000D";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	344 ["\\t" ] = "\\u0009";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	345 ["\\u" ] = "\\u";
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	346 };
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	347
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	348 function json.decode(json)
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	349 json = json:gsub("\\.", first_escape) -- get rid of all escapes except \uXXXX, making string parsing much simpler
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	350 --:gsub("[\r\n]", "\t"); -- \r\n\t are equivalent, we care about none of them, and none of them can be in strings
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5565 diff changeset	351
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	352 -- TODO do encoding verification
5776 bd0ff8ae98a8 Remove all trailing whitespace Florian Zeitz <florob@babelmonkeys.de> parents: 5565 diff changeset	353
5565 6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	354 local val, index = _readvalue(json, 1);
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	355 if val == nil then return val, index; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	356 if json:find("[^ \t\r\n]", index) then return nil, "garbage at eof"; end
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	357
6dd806829226 util.json: New, faster, stricter, more compliant JSON decoder. Now returns nil,err instead of throwing errors on invalid input. Waqas Hussain <waqas20@gmail.com> parents: 5563 diff changeset	358 return val;
3979 bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	359 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	360
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	361 function json.test(object)
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	362 local encoded = json.encode(object);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	363 local decoded = json.decode(encoded);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	364 local recoded = json.encode(decoded);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	365 if encoded ~= recoded then
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	366 print("FAILED");
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	367 print("encoded:", encoded);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	368 print("recoded:", recoded);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	369 else
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	370 print(encoded);
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	371 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	372 return encoded == recoded;
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	373 end
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	374
bf223e6c2b4c util.json: Initial commit. Waqas Hussain <waqas20@gmail.com> parents: diff changeset	375 return json;

prosody

ee2d5b2a263d

util/json.lua

Software / code / prosody

Annotate

util/json.lua @ 6270:ee2d5b2a263d

Software `/` code `/` prosody