generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

#2142 #2137 cherry pick 1

Browse Source
This commit is contained in:
Aleksandar Fabijanic
2018-02-08 09:08:42 -06:00
committed by Alex Fabijanic
parent 4a7ab78686
commit bd81aec779
13 changed files with 610 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
JSON/src/Object.cpp
View File

@@ -24,28 +24,22 @@ namespace Poco {
namespace JSON {
Object::Object(bool preserveInsOrder):
_preserveInsOrder(preserveInsOrder),
Object::Object(int options):
_preserveInsOrder(options & JSON_PRESERVE_KEY_ORDER),
_escapeUnicode(options & JSON_ESCAPE_UNICODE),
_modified(false)
{
}
Object::Object(const Object& copy) : _values(copy._values),
_preserveInsOrder(copy._preserveInsOrder),
_pStruct(!copy._modified ? copy._pStruct : 0),
_modified(copy._modified)
Object::Object(const Object& other) : _values(other._values),
_preserveInsOrder(other._preserveInsOrder),
_escapeUnicode(other._escapeUnicode),
_pStruct(!other._modified ? other._pStruct : 0),
_modified(other._modified)
{
if (_preserveInsOrder)
{
// need to update pointers in _keys to point to copied _values
for (KeyPtrList::const_iterator it = copy._keys.begin(); it != copy._keys.end(); ++it)
{
ValueMap::const_iterator itv = _values.find(**it);
poco_assert (itv != _values.end());
_keys.push_back(&itv->first);
}
}
syncKeys(other._keys);
}
@@ -56,9 +50,11 @@ Object::Object(Object&& other) :
_values(std::move(other._values)),
_keys(std::move(other._keys)),
_preserveInsOrder(other._preserveInsOrder),
_escapeUnicode(other._escapeUnicode),
_pStruct(!other._modified ? other._pStruct : 0),
_modified(other._modified)
{
other.clear();
}
@@ -66,9 +62,15 @@ Object &Object::operator= (Object &&other)
{
if (&other != this)
{
<<<<<<< HEAD
_values = std::move(other._values);
_keys = std::move(other._keys);
=======
_values = other._values;
>>>>>>> df5968ce1... Json unicode escape && preserveOrder keys sync (#2145)
_preserveInsOrder = other._preserveInsOrder;
syncKeys(other._keys);
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
}
@@ -91,13 +93,30 @@ Object &Object::operator= (const Object &other)
_values = other._values;
_keys = other._keys;
_preserveInsOrder = other._preserveInsOrder;
_escapeUnicode = other._escapeUnicode;
_pStruct = !other._modified ? other._pStruct : 0;
_modified = other._modified;
other.clear();
}
return *this;
}
void Object::syncKeys(const KeyList& keys)
{
if(_preserveInsOrder)
{
// update iterators in _keys to point to copied _values
for(KeyList::const_iterator it = keys.begin(); it != keys.end(); ++it)
{
ValueMap::const_iterator itv = _values.find((*it)->first);
poco_assert (itv != _values.end());
_keys.push_back(itv);
}
}
}
Var Object::get(const std::string& key) const
{
ValueMap::const_iterator it = _values.find(key);
@@ -134,13 +153,31 @@ Object::Ptr Object::getObject(const std::string& key) const
}
void Object::getNames(std::vector<std::string>& names) const
void Object::getNames(NameList& names) const
{
names.clear();
for (ValueMap::const_iterator it = _values.begin(); it != _values.end(); ++it)
if (_preserveInsOrder)
{
names.push_back(it->first);
for(KeyList::const_iterator it = _keys.begin(); it != _keys.end(); ++it)
{
names.push_back((*it)->first);
}
}
else
{
for(ValueMap::const_iterator it = _values.begin(); it != _values.end(); ++it)
{
names.push_back(it->first);
}
}
}
Object::NameList Object::getNames() const
{
NameList names;
getNames(names);
return names;
}
@@ -155,16 +192,16 @@ void Object::stringify(std::ostream& out, unsigned int indent, int step) const
}
const std::string& Object::getKey(KeyPtrList::const_iterator& iter) const
const std::string& Object::getKey(KeyList::const_iterator& iter) const
{
ValueMap::const_iterator it = _values.begin();
ValueMap::const_iterator end = _values.end();
for (; it != end; ++it)
{
if (it->first == **iter) return it->first;
if (it == *iter) return it->first;
}
throw NotFoundException(**iter);
throw NotFoundException((*iter)->first);
}
@@ -174,13 +211,13 @@ void Object::set(const std::string& key, const Dynamic::Var& value)
if (!ret.second) ret.first->second = value;
if (_preserveInsOrder)
{
KeyPtrList::iterator it = _keys.begin();
KeyPtrList::iterator end = _keys.end();
KeyList::iterator it = _keys.begin();
KeyList::iterator end = _keys.end();
for (; it != end; ++it)
{
if (key == **it) return;
if (key == (*it)->first) return;
}
_keys.push_back(&ret.first->first);
_keys.push_back(ret.first);
}
_modified = true;
}