From: Steven Barth <steven@midlink.org>
Date: Fri, 13 Nov 2009 18:25:59 +0000 (+0000)
Subject: JSON: Add encode / decode shortcut
X-Git-Tag: 0.10.0~961
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=43820b99ecac96b1f5c3abe44eb446cdea5d41b4;p=oweals%2Fluci.git

JSON: Add encode / decode shortcut
---

diff --git a/libs/json/luasrc/json.lua b/libs/json/luasrc/json.lua
index 26b540428..5b0928590 100644
--- a/libs/json/luasrc/json.lua
+++ b/libs/json/luasrc/json.lua
@@ -52,6 +52,7 @@ local type	    = type
 local pairs	    = pairs
 local ipairs    = ipairs
 local next      = next
+local pcall		= pcall
 
 local getmetatable = getmetatable
 
@@ -59,6 +60,33 @@ local getmetatable = getmetatable
 -- @cstyle	instance
 module "luci.json"
 
+
+--- Directly decode a JSON string
+-- @param json JSON-String
+-- @return Lua object
+function decode(json, ...)
+	local a = ActiveDecoder(function() return nil end, ...)
+	a.chunk = json
+	local s, obj = pcall(a.get, a)
+	return s and obj or nil
+end
+
+
+--- Direcly encode a Lua object into a JSON string.
+-- @param obj Lua Object
+-- @return JSON string
+function encode(obj, ...)
+	local out = {}
+	local e = Encoder(obj, 1, ...):source()
+	local chnk, err
+	repeat
+		chnk, err = e()
+		out[#out+1] = chnk
+	until chnk
+	return not err and table.concat(out) or nil
+end
+
+
 --- Null replacement function
 -- @return null
 function null()