marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix JSON serialization of proplists within arrays

alut-include-path
Lukas Werling 2017-03-18 00:26:58 +01:00
parent 8ca3801741
commit 9b61ba468d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/script/C4Value.cpp
View File

@ -228,7 +228,7 @@ StdStrBuf C4Value::ToJSON(int depth, const C4PropListStatic *ignore_reference_pa
for (int32_t i = 0; i < Data.Array->GetSize(); i++)
{
if (i) DataString.Append(",");
DataString.Append(std::move(Data.Array->GetItem(i).GetDataString(depth - 1)));
DataString.Append(std::move(Data.Array->GetItem(i).ToJSON(depth - 1)));
}
DataString.AppendChar(']');
return DataString;

8
tests/C4ValueTest.cpp
View File

@ -81,4 +81,12 @@ TEST(C4ValueTest, ToJSON)
array->SetItem(2, C4Value(3));
EXPECT_EQ(C4Value(array).ToJSON(), R"#([1,2,3])#");
}
{
auto proplist = C4PropList::NewStatic(nullptr, nullptr, nullptr);
proplist->SetProperty(P_Options, C4Value(123));
auto array = new C4ValueArray(1);
array->SetItem(0, C4Value(proplist));
EXPECT_EQ(C4Value(array).ToJSON(), R"#([{"Options":123}])#");
}
}