aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-03-13 21:11:33 +0100
committerKim Alvefur <zash@zash.se>2015-03-13 21:11:33 +0100
commit2114d7e5d83ded1f9298eeca6e81a6d5e48bfcdd (patch)
treedf700584d0ba3a720acc9ebfe7c1345b31d753c1
parent7efc09e181fe1788cdd0468b9de26a0f2c5f62c6 (diff)
downloadprosody-2114d7e5d83ded1f9298eeca6e81a6d5e48bfcdd.tar.gz
prosody-2114d7e5d83ded1f9298eeca6e81a6d5e48bfcdd.zip
util.json: Remove use of newproxy
-rw-r--r--util/json.lua7
1 files changed, 2 insertions, 5 deletions
diff --git a/util/json.lua b/util/json.lua
index a8a58afc..becd295d 100644
--- a/util/json.lua
+++ b/util/json.lua
@@ -13,7 +13,7 @@ local tostring, tonumber = tostring, tonumber;
local pairs, ipairs = pairs, ipairs;
local next = next;
local error = error;
-local newproxy, getmetatable, setmetatable = newproxy, getmetatable, setmetatable;
+local getmetatable, setmetatable = getmetatable, setmetatable;
local print = print;
local has_array, array = pcall(require, "util.array");
@@ -22,10 +22,7 @@ local array_mt = has_array and getmetatable(array()) or {};
--module("json")
local json = {};
-local null = newproxy and newproxy(true) or {};
-if getmetatable and getmetatable(null) then
- getmetatable(null).__tostring = function() return "null"; end;
-end
+local null = setmetatable({}, { __tostring = function() return "null"; end; });
json.null = null;
local escapes = {