diff options
| author | Philipp Gesang <phg@phi-gamma.net> | 2017-02-01 08:18:28 +0100 |
|---|---|---|
| committer | Philipp Gesang <phg@phi-gamma.net> | 2017-02-01 08:18:28 +0100 |
| commit | 19ba6b14e20738c82ad539b2a4b0690e7880e3cb (patch) | |
| tree | fa23bc0113f3a8f141e2ecd06a1d352665f408d7 /lualibs-util-jsn.lua | |
| parent | 12d27922f7bb7f466b5d476fa2c1ddc08a300513 (diff) | |
| download | lualibs-19ba6b14e20738c82ad539b2a4b0690e7880e3cb.tar.gz | |
sync with Context as of 2017-02-01
Diffstat (limited to 'lualibs-util-jsn.lua')
| -rw-r--r-- | lualibs-util-jsn.lua | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lualibs-util-jsn.lua b/lualibs-util-jsn.lua index bbe25d8..e835c07 100644 --- a/lualibs-util-jsn.lua +++ b/lualibs-util-jsn.lua @@ -64,18 +64,19 @@ local jnumber = (1-whitespace-rparent-rbrace-comma)^1 / tonumber local key = jstring local jsonconverter = { "value", - object = lbrace * Cf(Ct("") * V("pair") * (comma * V("pair"))^0,rawset) * rbrace, - pair = Cg(optionalws * key * optionalws * colon * V("value")), - array = Ct(lparent * V("value") * (comma * V("value"))^0 * rparent), - value = optionalws * (jstring + V("object") + V("array") + jtrue + jfalse + jnull + jnumber + #rparent) * optionalws, + hash = lbrace * Cf(Ct("") * (V("pair") * (comma * V("pair"))^0 + optionalws),rawset) * rbrace, + pair = Cg(optionalws * key * optionalws * colon * V("value")), + array = Ct(lparent * (V("value") * (comma * V("value"))^0 + optionalws) * rparent), +-- value = optionalws * (jstring + V("hash") + V("array") + jtrue + jfalse + jnull + jnumber + #rparent) * optionalws, + value = optionalws * (jstring + V("hash") + V("array") + jtrue + jfalse + jnull + jnumber) * optionalws, } -- local jsonconverter = { "value", --- object = lbrace * Cf(Ct("") * V("pair") * (comma * V("pair"))^0,rawset) * rbrace, --- pair = Cg(optionalws * V("string") * optionalws * colon * V("value")), --- array = Ct(lparent * V("value") * (comma * V("value"))^0 * rparent), --- string = jstring, --- value = optionalws * (V("string") + V("object") + V("array") + jtrue + jfalse + jnull + jnumber) * optionalws, +-- hash = lbrace * Cf(Ct("") * (V("pair") * (comma * V("pair"))^0 + optionalws),rawset) * rbrace, +-- pair = Cg(optionalws * V("string") * optionalws * colon * V("value")), +-- array = Ct(lparent * (V("value") * (comma * V("value"))^0 + optionalws) * rparent), +-- string = jstring, +-- value = optionalws * (V("string") + V("hash") + V("array") + jtrue + jfalse + jnull + jnumber) * optionalws, -- } -- lpeg.print(jsonconverter) -- size 181 @@ -156,3 +157,5 @@ end -- inspect(tmp) -- inspect(json.tostring(true)) + +return json |