generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-23 08:31:43 +02:00
Code Issues Projects Releases Wiki Activity

Preserve entries order in DynamicStruct #2410 (#2413)

Browse Source 
* Preserve entries order in DynamicStruct #2410

* disable C++11 default

* ifdef C++11 code
This commit is contained in:
Aleksandar Fabijanic
2018-08-01 08:06:59 -07:00
committed by GitHub
parent 6107b43a7b
commit 231ef2762d
11 changed files with 825 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
JSON/src/Object.cpp
View File

@@ -220,52 +220,51 @@ Object& Object::set(const std::string& key, const Dynamic::Var& value)
Poco::DynamicStruct Object::makeStruct(const Object::Ptr& obj)
{
Poco::DynamicStruct ds;
ConstIterator it = obj->begin();
ConstIterator end = obj->end();
for (; it != end; ++it)
{
if (obj->isObject(it))
{
Object::Ptr pObj = obj->getObject(it->first);
DynamicStruct str = makeStruct(pObj);
ds.insert(it->first, str);
}
else if (obj->isArray(it))
{
Array::Ptr pArr = obj->getArray(it->first);
std::vector<Poco::Dynamic::Var> v = Poco::JSON::Array::makeArray(pArr);
ds.insert(it->first, v);
}
else
ds.insert(it->first, it->second);
}
return ds;
return makeStructImpl<Poco::DynamicStruct>(obj);
}
#ifdef POCO_ENABLE_CPP11
Poco::OrderedDynamicStruct Object::makeOrderedStruct(const Object::Ptr& obj)
{
return makeStructImpl<Poco::OrderedDynamicStruct>(obj);
}
/*
void Object::resetOrdDynStruct() const
{
if (!_pOrdStruct)
_pOrdStruct = new Poco::OrderedDynamicStruct;
else
_pOrdStruct->clear();
}
*/
#endif // POCO_ENABLE_CPP11
/*
void Object::resetDynStruct() const
{
if (!_pStruct)
_pStruct = new Poco::DynamicStruct;
else
_pStruct->clear();
}
}*/
Object::operator const Poco::DynamicStruct& () const
{
if (!_values.size())
{
resetDynStruct();
resetDynStruct(_pStruct);
}
else if (_modified)
{
ValueMap::const_iterator it = _values.begin();
ValueMap::const_iterator end = _values.end();
resetDynStruct();
resetDynStruct(_pStruct);
for (; it != end; ++it)
{
if (isObject(it))
@@ -287,6 +286,68 @@ Object::operator const Poco::DynamicStruct& () const
}
#ifdef POCO_ENABLE_CPP11
Object::operator const Poco::OrderedDynamicStruct& () const
{
if (!_values.size())
{
resetDynStruct(_pOrdStruct);
}
else if (_modified)
{
if (_preserveInsOrder)
{
KeyList::const_iterator it = _keys.begin();
KeyList::const_iterator end = _keys.end();
resetDynStruct(_pOrdStruct);
for (; it != end; ++it)
{
if (isObject((*it)->first))
{
_pOrdStruct->insert((*it)->first, makeOrderedStruct(getObject((*it)->first)));
}
else if (isArray((*it)->first))
{
_pOrdStruct->insert((*it)->first, Poco::JSON::Array::makeArray(getArray((*it)->first)));
}
else
{
_pOrdStruct->insert((*it)->first, (*it)->second);
}
}
}
else
{
ValueMap::const_iterator it = _values.begin();
ValueMap::const_iterator end = _values.end();
resetDynStruct(_pOrdStruct);
for (; it != end; ++it)
{
if (isObject(it))
{
_pOrdStruct->insert(it->first, makeOrderedStruct(getObject(it->first)));
}
else if (isArray(it))
{
_pOrdStruct->insert(it->first, Poco::JSON::Array::makeArray(getArray(it->first)));
}
else
{
_pOrdStruct->insert(it->first, it->second);
}
}
}
}
return *_pOrdStruct;
}
#endif // POCO_ENABLE_CPP11
void Object::clear()
{
_values.clear();