Skip to content

Commit 2ac379c

Browse files
RaphaelIT7RaphaelIT7
committed
util: fix up some json issues
solves #101
1 parent 7b7056a commit 2ac379c

File tree

3 files changed

+136
-9
lines changed

3 files changed

+136
-9
lines changed

‎gluatests/lua/tests/modules/util/FancyJSONToTable.lua‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
return {
2+
groupName = "util.FancyJSONToTable",
3+
cases = {
4+
{
5+
name = "Function exists on meta table",
6+
when = HolyLib_IsModuleEnabled("util"),
7+
func = function()
8+
expect( util.FancyJSONToTable ).to.beA( "function" )
9+
end
10+
},
11+
{
12+
name = "Metatable doesn't exist",
13+
when = not HolyLib_IsModuleEnabled("util"),
14+
func = function()
15+
expect( util.FancyJSONToTable ).to.beA( "nil" ) -- util table always exists since its created by gmod
16+
end
17+
},
18+
{ -- This one is a former crash: https://github.com/RaphaelIT7/gmod-holylib/issues/101
19+
name = "Returns a proper result",
20+
when = HolyLib_IsModuleEnabled("util"),
21+
func = function()
22+
local expectedTable = {
23+
{
24+
[1] = 1,
25+
[2] = 2,
26+
[3] = 3,
27+
}
28+
}
29+
30+
local actualTable = util.FancyJSONToTable( "[[1, 2, 3]]" )
31+
32+
expect( actualTable ).to.deepEqual( expectedTable )
33+
end
34+
},
35+
{
36+
name = "Performance",
37+
when = HolyLib_IsModuleEnabled("util"),
38+
func = function()
39+
HolyLib_RunPerformanceTest("util.FancyJSONToTable", util.FancyJSONToTable, "[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [\"Hello World\", \"World2\", \"World3\"]]")
40+
end
41+
},
42+
{
43+
name = "Performance",
44+
when = HolyLib_IsModuleEnabled("util"),
45+
func = function()
46+
HolyLib_RunPerformanceTest("util.JSONToTable(GMOD)", util.JSONToTable, "[[1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [\"Hello World\", \"World2\", \"World3\"]]")
47+
end
48+
},
49+
}
50+
}

‎gluatests/lua/tests/modules/util/FancyTableToJSON.lua‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
local exampleTable = {
2+
[1] = 1,
3+
[2] = 2,
4+
[3] = 3,
5+
["Test"] = "Hello World", -- Stuff like that once crashed, see https://github.com/RaphaelIT7/gmod-holylib/commit/3d0ab6c2a132f8e96a3248dfb73650d67a6c4554
6+
[4] = 4,
7+
[5] = 5,
8+
[6] = {
9+
[1] = Vector(1, 2, 3),
10+
[2] = Vector(4, 5, 6),
11+
[3] = Vector(7, 8, 9),
12+
},
13+
[7] = math.huge,
14+
[8] = {
15+
[1] = Angle(1, 2, 3),
16+
[2] = Angle(4, 5, 6),
17+
[3] = Angle(7, 8, 9),
18+
},
19+
}
20+
21+
return {
22+
groupName = "util.FancyTableToJSON",
23+
cases = {
24+
{
25+
name = "Function exists on meta table",
26+
when = HolyLib_IsModuleEnabled("util"),
27+
func = function()
28+
expect( util.FancyTableToJSON ).to.beA( "function" )
29+
end
30+
},
31+
{
32+
name = "Metatable doesn't exist",
33+
when = not HolyLib_IsModuleEnabled("util"),
34+
func = function()
35+
expect( util.FancyTableToJSON ).to.beA( "nil" ) -- util table always exists since its created by gmod
36+
end
37+
},
38+
{
39+
name = "Returns a proper result",
40+
when = HolyLib_IsModuleEnabled("util"),
41+
func = function()
42+
local actualTable = util.FancyTableToJSON( exampleTable )
43+
44+
expect( actualTable ).to.equal( "{\"1\":1,\"2\":2,\"3\":3,\"4\":4,\"5\":5,\"6\":[\"[1 2 3]\",\"[4 5 6]\",\"[7 8 9]\"],\"7\":null,\"8\":[\"{1 2 3}\",\"{4 5 6}\",\"{7 8 9}\"],\"Test\":\"Hello World\"}" )
45+
end
46+
},
47+
{
48+
name = "Results includes null",
49+
when = HolyLib_IsModuleEnabled("util"),
50+
func = function()
51+
local actualTable = util.FancyTableToJSON( { math.huge } )
52+
53+
expect( actualTable ).to.equal( "[null]" ) -- We differ from gmod, as Gmod hides null / would be []
54+
end
55+
},
56+
{
57+
name = "Performance",
58+
when = HolyLib_IsModuleEnabled("util"),
59+
func = function()
60+
HolyLib_RunPerformanceTest("util.FancyTableToJSON", util.FancyTableToJSON, exampleTable)
61+
end
62+
},
63+
{
64+
name = "Performance",
65+
when = HolyLib_IsModuleEnabled("util"),
66+
func = function()
67+
HolyLib_RunPerformanceTest("util.TableToJSON(GMOD)", util.TableToJSON, exampleTable)
68+
end
69+
},
70+
}
71+
}

‎source/modules/util.cpp‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void TableToJSONRecursive(GarrysMod::Lua::ILuaInterface* pLua, LuaUtilModuleData
291291
//}
292292

293293
while (pLua->Next(-2)) {
294-
// In bootil, you just don't give a child a name to indicate that it's sequentail.
294+
// In bootil, you just don't give a child a name to indicate that it's sequential.
295295
// so we need to support that.
296296
bool isSequential = false;
297297
int iKeyType = pLua->GetType(-2);
@@ -340,10 +340,14 @@ void TableToJSONRecursive(GarrysMod::Lua::ILuaInterface* pLua, LuaUtilModuleData
340340
case GarrysMod::Lua::Type::Number:
341341
{
342342
double pNumber = pLua->GetNumber(-1);
343-
if (IsInt(pNumber))
344-
value.SetInt(pNumber);
345-
else
346-
value.SetDouble(pNumber);
343+
if (isfinite(pNumber)) { // Needed for math.huge
344+
if (IsInt(pNumber))
345+
value.SetInt(pNumber);
346+
else
347+
value.SetDouble(pNumber);
348+
} else {
349+
value.SetNull();
350+
}
347351
}
348352
break;
349353
case GarrysMod::Lua::Type::Bool:
@@ -483,6 +487,9 @@ void PushJSONValue(GarrysMod::Lua::ILuaInterface* pLua, const rapidjson::Value&
483487
void JSONToTableRecursive(GarrysMod::Lua::ILuaInterface* pLua, const rapidjson::Value& jsonValue, bool noSet)
484488
{
485489
if (jsonValue.IsObject()) {
490+
if (!noSet)
491+
pLua->PreCreateTable(0, jsonValue.MemberCount());
492+
486493
for (rapidjson::Value::ConstMemberIterator itr = jsonValue.MemberBegin(); itr != jsonValue.MemberEnd(); ++itr) {
487494
const rapidjson::Value& value = itr->value;
488495

@@ -500,12 +507,11 @@ void JSONToTableRecursive(GarrysMod::Lua::ILuaInterface* pLua, const rapidjson::
500507
PushJSONValue(pLua, itr->value);
501508

502509
if (!noSet)
503-
{
504510
pLua->SetTable(-3);
505-
}
506511
}
507512
} else if (jsonValue.IsArray()) {
508513
int idx = 0;
514+
pLua->PreCreateTable(jsonValue.Size(), 0);
509515
for (rapidjson::SizeType i = 0; i < jsonValue.Size(); ++i)
510516
{
511517
JSONToTableRecursive(pLua, jsonValue[i], true);
@@ -528,7 +534,6 @@ LUA_FUNCTION_STATIC(util_JSONToTable)
528534
return 0;
529535
}
530536

531-
LUA->CreateTable();
532537
JSONToTableRecursive(LUA, doc);
533538
return 1;
534539
}
@@ -790,10 +795,11 @@ void CUtilModule::LuaShutdown(GarrysMod::Lua::ILuaInterface* pLua)
790795
Util::RemoveField(pLua, "AsyncCompress");
791796
Util::RemoveField(pLua, "AsyncDecompress");
792797
Util::RemoveField(pLua, "FancyTableToJSON");
798+
Util::RemoveField(pLua, "FancyJSONToTable");
793799
Util::RemoveField(pLua, "CompressLZ4");
794800
Util::RemoveField(pLua, "DecompressLZ4");
795801
Util::RemoveField(pLua, "AsyncTableToJSON");
796-
Util::RemoveField(pLua, "AsyncJSONToTable");
802+
// Util::RemoveField(pLua, "AsyncJSONToTable");
797803
Util::PopTable(pLua);
798804
}
799805
}

0 commit comments

Comments
 (0)