github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: JsonIO now supports default values (just like XmlIO)

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11876 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2018-04-03 17:16:25 +00:00
parent 78869e8215
commit f385c85665
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

29
uppsrc/Core/JSON.h
View file

@ -102,6 +102,9 @@ public:
template <class T>
JsonIO& operator()(const char *key, T& value);
template <class T>
JsonIO& operator()(const char *key, T& value, const T& defvalue);
JsonIO(const Value& src) : src(&src) {}
JsonIO() { src = NULL; }
@ -141,6 +144,32 @@ JsonIO& JsonIO::operator()(const char *key, T& value)
return *this;
}
template <class T>
JsonIO& JsonIO::operator()(const char *key, T& value, const T& defvalue)
{
if(IsLoading()) {
const Value& v = (*src)[key];
if(v.IsVoid())
value = defvalue;
else {
JsonIO jio(v);
Jsonize(jio, value);
}
}
else {
ASSERT(tgt.IsVoid());
if(!map)
map.Create();
JsonIO jio;
Jsonize(jio, value);
if(jio.map)
map->Add(key, *jio.map);
else
map->Add(key, jio.tgt);
}
return *this;
}
template <class T>
Value StoreAsJsonValue(const T& var)
{

15
uppsrc/Core/src.tpp/Jsonize_en-us.tpp
View file

@ -1,5 +1,4 @@
topic "JsonIO and Jsonize framework";
[2 $$0,0#00000000000000000000000000000000:Default]
[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
[l288;2 $$2,2#27521748481378242620020725143825:desc]
[0 $$3,0#96390100711032703541132217272105:end]
@ -9,6 +8,7 @@ topic "JsonIO and Jsonize framework";
[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
[b42;2 $$9,9#13035079074754324216151401829390:normal]
[2 $$0,0#00000000000000000000000000000000:Default]
[{_}
[ {{10000@(113.42.0) [s0;%% [*@7;4 JsonIO and Jsonize framework]]}}&]
[s3; &]
@ -58,7 +58,18 @@ har]_`*[*@3 key], [*@4 T][@(0.0.255) `&]_[*@3 value])&]
[s2;%% Sets the JsonIO to represent JSON object (if it does not already),
creates member [%-*@3 key] and jsonizes [%-*@3 value] into it (by
calling global Jsonize function, whose general form invokes Jsonize
method)..&]
method).&]
[s3;%% &]
[s4; &]
[s5;:Upp`:`:JsonIO`:`:operator`(`)`(const char`*`,T`&`,const T`&`): [@(0.0.255) templat
e]_<[@(0.0.255) class]_[*@4 T]>_[_^Upp`:`:JsonIO^ JsonIO][@(0.0.255) `&]_[* operator()]([@(0.0.255) c
onst]_[@(0.0.255) char]_`*[*@3 key], [*@4 T][@(0.0.255) `&]_[*@3 value],
[@(0.0.255) const]_[*@4 T][@(0.0.255) `&]_[*@3 defvalue])&]
[s2;%% Sets the JsonIO to represent JSON object (if it does not already),
creates member [%-*@3 key] and jsonizes [%-*@3 value] into it (by
calling global Jsonize function, whose general form invokes Jsonize
method). When loading and [%-*@3 key] is missing in source data,
[%-*@3 defvalue] is assigned to [%-*@3 value].&]
[s3;%% &]
[s4;%% &]
[s5;:JsonIO`:`:JsonIO`(const Value`&`): [* JsonIO]([@(0.0.255) const]_[_^Value^ Value][@(0.0.255) `&