Improve tlx

Author: halx99

axmol/tlx/flat_map.hpp

@@ -67,7 +67,7 @@ class flat_map : public detail::flat_map_base<flat_map_traits<Key, T, Compare, K
             auto pos = it._k_it;
             auto idx = pos - this->_Mykeys._Myval2.begin();
             this->_Mykeys._Myval2.insert(pos, key);
-            this->_Myvals.insert(this->_Myvals.begin() + idx, T{});
+            this->_Myvals.emplace(this->_Myvals.begin() + idx);
             it = typename impl_type::iterator(this->_Mykeys._Myval2.begin() + idx, this->_Myvals.begin() + idx);
         }
         return (*it).second;

axmol/tlx/flat_map_base.hpp

@@ -63,12 +63,12 @@ class flat_map_base
 
     class iterator
     {
+    public:
         using key_iter    = typename key_container::iterator;
         using mapped_iter = typename mapped_container::iterator;
         key_iter _k_it;
         mapped_iter _v_it;
 
-    public:
         using difference_type   = typename key_container::difference_type;
         using value_type        = value_proxy;
         using reference         = value_proxy;
@@ -98,12 +98,12 @@ class flat_map_base
 
     class const_iterator
     {
+    public:
         using key_iter    = typename key_container::const_iterator;
         using mapped_iter = typename mapped_container::const_iterator;
         key_iter _k_it;
         mapped_iter _v_it;
 
-    public:
         using difference_type   = typename key_container::difference_type;
         using value_type        = value_proxy;
         using reference         = value_proxy;
@@ -233,6 +233,46 @@ class flat_map_base
         }
     }
 
+    // erase by iterator
+    iterator erase(iterator pos)
+    {
+        auto k_it = pos._k_it;
+        auto v_it = pos._v_it;
+        _Mykeys._Myval2.erase(k_it);
+        _Myvals.erase(v_it);
+        return iterator(k_it, v_it);
+    }
+
+    // erase by key
+    size_type erase(const key_type& key)
+    {
+        const auto& pred = _Mykeys._Get_first();
+        auto k_it        = std::lower_bound(_Mykeys._Myval2.begin(), _Mykeys._Myval2.end(), key, pred);
+        auto v_it        = _Myvals.begin() + (k_it - _Mykeys._Myval2.begin());
+
+        if (k_it == _Mykeys._Myval2.end() || pred(key, *k_it) || pred(*k_it, key))
+            return 0;  // not found
+
+        if constexpr (_Traits::allow_duplicates)
+        {
+            // multimap: erase all equal keys
+            auto k_end = std::upper_bound(k_it, _Mykeys._Myval2.end(), key, pred);
+            auto v_end = _Myvals.begin() + (k_end - _Mykeys._Myval2.begin());
+
+            size_type count = static_cast<size_type>(k_end - k_it);
+            _Mykeys._Myval2.erase(k_it, k_end);
+            _Myvals.erase(v_it, v_end);
+            return count;
+        }
+        else
+        {
+            // map: erase single element
+            _Mykeys._Myval2.erase(k_it);
+            _Myvals.erase(v_it);
+            return 1;
+        }
+    }
+
     const auto& keys() const { return _Mykeys; }
 
 protected: