flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed Lua Json serializing a bool.

Browse Source 
Fixes #3257.
This commit is contained in:
Mattes D 2016-07-10 08:16:44 +02:00
parent 97b9422a3e
commit 5095a9f48b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Server/Plugins/Debuggers/Debuggers.lua
View File

@ -2026,22 +2026,24 @@ end
function HandleConsoleTestJson(a_Split, a_EntireCmd) function HandleConsoleTestJson(a_Split, a_EntireCmd)
LOG("Testing Json parsing...") LOG("Testing Json parsing...")
local t1 = cJson:Parse([[{"a": 1, "b": "2", "c": [3, "4", 5] }]]) local t1 = cJson:Parse([[{"a": 1, "b": "2", "c": [3, "4", 5], "d": true }]])
assert(t1.a == 1) assert(t1.a == 1)
assert(t1.b == "2") assert(t1.b == "2")
assert(t1.c[1] == 3) assert(t1.c[1] == 3)
assert(t1.c[2] == "4") assert(t1.c[2] == "4")
assert(t1.c[3] == 5) assert(t1.c[3] == 5)
assert(t1.d == true)
LOG("Json parsing example 1 successful")
local t2, msg = cJson:Parse([[{"some": invalid, json}]]) local t2, msg = cJson:Parse([[{"some": invalid, json}]])
assert(t2 == nil) assert(t2 == nil)
assert(type(msg) == "string") assert(type(msg) == "string")
LOG("Error message returned: " .. msg) LOG("Json parsing an invalid string: Error message returned: " .. msg)
LOG("Json parsing test succeeded") LOG("Json parsing test succeeded")
LOG("Testing Json serializing...") LOG("Testing Json serializing...")
local s1 = cJson:Serialize({a = 1, b = "2", c = {3, "4", 5}}, {indentation = " "}) local s1 = cJson:Serialize({a = 1, b = "2", c = {3, "4", 5}, d = true}, {indentation = " "})
LOG("Serialization result: " .. (s1 or "<nil>")) LOG("Serialization result: " .. (s1 or "<nil>"))
LOG("Json serializing test succeeded") LOG("Json serializing test succeeded")

10
src/Bindings/LuaJson.cpp
View File

@ -160,6 +160,16 @@ static Json::Value JsonSerializeValue(cLuaState & a_LuaState)
{ {
switch (lua_type(a_LuaState, -1)) switch (lua_type(a_LuaState, -1))
{ {
case LUA_TBOOLEAN:
{
bool v;
a_LuaState.GetStackValue(-1, v);
return Json::Value(v);
}
case LUA_TNIL:
{
return Json::Value(Json::nullValue);
}
case LUA_TNUMBER: case LUA_TNUMBER:
{ {
lua_Number v; lua_Number v;