games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00
Code Issues Releases Activity

Implemented 'strict' json support

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-13 18:08:35 +02:00
parent d1c274f93f
commit 41493d6f67
8 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/json/JsonNode.cpp
View File

@ -79,8 +79,12 @@ JsonNode::JsonNode(const std::string & string)
{}
JsonNode::JsonNode(const std::byte *data, size_t datasize)
:JsonNode(data, datasize, JsonParsingSettings())
{}
JsonNode::JsonNode(const std::byte *data, size_t datasize, const JsonParsingSettings & parserSettings)
{
JsonParser parser(reinterpret_cast<const char*>(data), datasize);
JsonParser parser(reinterpret_cast<const char*>(data), datasize, parserSettings);
*this = parser.parse("<unknown>");
}
@ -88,7 +92,7 @@ JsonNode::JsonNode(const JsonPath & fileURI)
{
auto file = CResourceHandler::get()->load(fileURI)->readAll();
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second);
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second, JsonParsingSettings());
*this = parser.parse(fileURI.getName());
}
@ -96,7 +100,7 @@ JsonNode::JsonNode(const JsonPath & fileURI, const std::string & idx)
{
auto file = CResourceHandler::get(idx)->load(fileURI)->readAll();
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second);
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second, JsonParsingSettings());
*this = parser.parse(fileURI.getName());
}
@ -104,7 +108,7 @@ JsonNode::JsonNode(const JsonPath & fileURI, bool &isValidSyntax)
{
auto file = CResourceHandler::get()->load(fileURI)->readAll();
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second);
JsonParser parser(reinterpret_cast<char*>(file.first.get()), file.second, JsonParsingSettings());
*this = parser.parse(fileURI.getName());
isValidSyntax = parser.isValid();
}