boost/json
2
0
Fork 0
mirror of https://github.com/boostorg/json.git synced 2026-02-13 12:32:12 +00:00
Code Issues Projects Releases Wiki Activity

Refactor object::erase

Browse Source
This commit is contained in:
Guðmundur F. Aðalsteinsson
2022-09-16 20:25:28 +00:00
parent e1088609c2
commit 47f2ad5509
2 changed files with 56 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
include/boost/json/impl/object.ipp
View File

@@ -508,30 +508,17 @@ object::
erase(const_iterator pos) noexcept ->
iterator
{
auto p = begin() + (pos - begin());
if(t_->is_small())
{
p->~value_type();
--t_->size;
auto const pb = end();
if(p != end())
{
return do_erase(pos,
[this](iterator p) {
// the casts silence warnings
std::memcpy(
static_cast<void*>(p),
static_cast<void const*>(pb),
static_cast<void const*>(end()),
sizeof(*p));
}
return p;
}
remove(t_->bucket(p->key()), *p);
p->~value_type();
--t_->size;
if(p != end())
{
reindex_relocate(end(), p);
}
return p;
},
[this](iterator p) {
reindex_relocate(end(), p);
});
}
auto
@@ -551,30 +538,20 @@ object::
stable_erase(const_iterator pos) noexcept ->
iterator
{
auto p = begin() + (pos - begin());
if(t_->is_small())
{
p->~value_type();
--t_->size;
if(p != end())
{
return do_erase(pos,
[this](iterator p) {
// the casts silence warnings
std::memmove(
static_cast<void*>(p),
static_cast<void const*>(p + 1),
sizeof(*p) * (end() - p));
}
return p;
}
remove(t_->bucket(p->key()), *p);
p->~value_type();
--t_->size;
auto pret = p;
for (; p != end(); ++p)
{
reindex_relocate(p + 1, p);
}
return pret;
},
[this](iterator p) {
for (; p != end(); ++p)
{
reindex_relocate(p + 1, p);
}
});
}
auto
@@ -863,6 +840,36 @@ destroy(
(--last)->~key_value_pair();
}
template<class FS, class FB>
auto
object::
do_erase(
const_iterator pos,
FS small_reloc,
FB big_reloc) noexcept
-> iterator
{
auto p = begin() + (pos - begin());
if(t_->is_small())
{
p->~value_type();
--t_->size;
if(p != end())
{
small_reloc(p);
}
return p;
}
remove(t_->bucket(p->key()), *p);
p->~value_type();
--t_->size;
if(p != end())
{
big_reloc(p);
}
return p;
}
void
object::
reindex_relocate(

12
include/boost/json/object.hpp
View File

@@ -1176,7 +1176,7 @@ public:
References and iterators from `pos` to `end()`, both
included, are invalidated. Other iterators and references
are not invalidated.
The relative order of non-erased elements is preserved.
The relative order of remaining elements is preserved.
@note
@@ -1202,7 +1202,7 @@ public:
Remove the element which matches `key`, if it exists.
All references and iterators are invalidated.
The relative order of non-erased elements is preserved.
The relative order of remaining elements is preserved.
@par Complexity
Linear in @ref size().
@@ -1621,6 +1621,14 @@ private:
key_value_pair* first,
key_value_pair* last) noexcept;
template<class FS, class FB>
auto
do_erase(
const_iterator pos,
FS small_reloc,
FB big_reloc) noexcept
-> iterator;
inline
void
reindex_relocate(