games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-27 22:49:25 +02:00
Code Issues Releases Activity

Configure JSON merge behaviour via #override flag (#423)

Browse Source 
* added json flags; override flag affects how structs are merged
This commit is contained in:
Henning Koehler
2018-03-05 16:30:10 +13:00
committed by ArseniyShestakov
parent f126a34a5e
commit 4ee9d7f65a
4 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/JsonNode.h
View File

@@ -45,8 +45,10 @@ private:
JsonData data;
public:
/// free to use metadata field
/// free to use metadata fields
std::string meta;
// meta-flags like override
std::vector<std::string> flags;
//Create empty node
JsonNode(JsonType Type = JsonType::DATA_NULL);
@@ -119,6 +121,10 @@ public:
template <typename Handler> void serialize(Handler &h, const int version)
{
h & meta;
if(version >= 782)
{
h & flags;
}
h & type;
switch(type)
{
@@ -173,7 +179,7 @@ namespace JsonUtils
* null : if value in source is present but set to null it will delete entry in dest
* @note this function will destroy data in source
*/
DLL_LINKAGE void merge(JsonNode & dest, JsonNode & source);
DLL_LINKAGE void merge(JsonNode & dest, JsonNode & source, bool noOverride = false);
/**
* @brief recursively merges source into dest, replacing identical fields
@@ -183,7 +189,7 @@ namespace JsonUtils
* null : if value in source is present but set to null it will delete entry in dest
* @note this function will preserve data stored in source by creating copy
*/
DLL_LINKAGE void mergeCopy(JsonNode & dest, JsonNode source);
DLL_LINKAGE void mergeCopy(JsonNode & dest, JsonNode source, bool noOverride = false);
/** @brief recursively merges descendant into copy of base node
* Result emulates inheritance semantic