map access interface

flat_map.hpp

@@ -135,18 +135,43 @@ namespace flat_hpp
             return data_.max_size();
         }
 
-        template < typename P
+        mapped_type& operator[](key_type&& key) {
-                 , typename = std::enable_if_t<std::is_constructible<value_type, P>::value> >
+            return insert(value_type(std::move(key), mapped_type())).first->second;
-        std::pair<iterator, bool> insert(P&& p) {
-            //TODO(BlackMat): implme
-            return std::make_pair(end(), false);
         }
 
-        template < typename P
+        mapped_type& operator[](const key_type& key) {
-                 , typename = std::enable_if_t<std::is_constructible<value_type, P>::value> >
+            return insert(value_type(key, mapped_type())).first->second;
-        std::pair<iterator, bool> insert(const_iterator hint, P&& p) {
+        }
+
+        mapped_type& at(const key_type& key) {
+            const auto iter = find(key);
+            if ( iter != end() ) {
+                return iter->second;
+            }
+            throw std::out_of_range("flat_map::at: key not found");
+        }
+
+        const mapped_type& at(const key_type& key) const {
+            const auto iter = find(key);
+            if ( iter != end() ) {
+                return iter->second;
+            }
+            throw std::out_of_range("flat_map::at: key not found");
+        }
+
+        std::pair<iterator, bool> insert(const value_type& value) {
+            bool found = true;
+            iterator iter = lower_bound(value.first);
+            if ( iter == end() || compare_(value.first, iter->first) ) {
+                iter = data_.insert(iter, value);
+                found = false;
+            }
+            return std::make_pair(iter, !found);
+        }
+
+        std::pair<iterator, bool> insert(const_iterator hint, const value_type& value) {
             //TODO(BlackMat): implme
-            return std::make_pair(end(), false);
+            return insert(value);
         }
 
         template < typename InputIter >
@@ -165,7 +190,7 @@ namespace flat_hpp
         template < typename... Args >
         std::pair<iterator, bool> emplace_hint(const_iterator hint, Args&&... args) {
             //TODO(BlackMat): implme
-            return insert(value_type(std::forward<Args>(args)...));
+            return insert(hint, value_type(std::forward<Args>(args)...));
         }
 
         void clear() noexcept {
@@ -197,13 +222,19 @@ namespace flat_hpp
         }
 
         iterator find(const key_type& key) {
-            //TODO(BlackMat): implme
+            iterator iter = lower_bound(key);
-            return end();
+            if ( iter != end() && compare_(key, iter->first) ) {
+                iter = end();
+            }
+            return iter;
         }
 
         const_iterator find(const key_type& key) const {
-            //TODO(BlackMat): implme
+            const_iterator iter = lower_bound(key);
-            return end();
+            if ( iter != end() && compare_(key, iter->first) ) {
+                iter = end();
+            }
+            return iter;
         }
 
         std::pair<iterator, iterator> equal_range(const key_type& key) {
@@ -218,22 +249,30 @@ namespace flat_hpp
 
         iterator lower_bound(const key_type& key) {
             //TODO(BlackMat): implme
-            return end();
+            return std::lower_bound(begin(), end(), key, [this](const value_type& l, const key_type& r){
+                return compare_(l.first, r);
+            });
         }
 
         const_iterator lower_bound(const key_type& key) const {
             //TODO(BlackMat): implme
-            return end();
+            return std::lower_bound(begin(), end(), key, [this](const value_type& l, const key_type& r){
+                return compare_(l.first, r);
+            });
         }
 
         iterator upper_bound(const key_type& key) {
             //TODO(BlackMat): implme
-            return end();
+            return std::upper_bound(begin(), end(), key, [this](const key_type& l, const value_type& r){
+                return compare_(l, r.first);
+            });
         }
 
         const_iterator upper_bound(const key_type& key) const {
             //TODO(BlackMat): implme
-            return end();
+            return std::upper_bound(begin(), end(), key, [this](const key_type& l, const value_type& r){
+                return compare_(l, r.first);
+            });
         }
 
         key_compare key_comp() const {

flat_map_tests.cpp

@@ -18,13 +18,12 @@ namespace
         using value_type = T;
 
         T* allocate(std::size_t n) {
-            (void)n;
+            return static_cast<T*>(std::malloc(sizeof(T) * n));
-            return nullptr;
         }
 
         void deallocate(T* p, std::size_t n) {
-            (void)p;
             (void)n;
+            std::free(p);
         }
     };
 
@@ -87,7 +86,7 @@ TEST_CASE("flat_map") {
         }
 
         {
-            std::vector<std::pair<const int,unsigned>> v;
+            std::vector<std::pair<int,unsigned>> v;
             auto s0 = map_t(v.cbegin(), v.cend());
             auto s1 = map_t(v.cbegin(), v.cend(), alloc_t());
             auto s2 = map_t(v.cbegin(), v.cend(), std::less<int>());
@@ -108,10 +107,21 @@ TEST_CASE("flat_map") {
         s0.size();
         s0.max_size();
     }
+    SECTION("access") {
+        using map_t = flat_map<int, unsigned>;
+        map_t s0;
+        s0[1] = 42;
+        s0.at(1);
+        my_as_const(s0).at(1);
+    }
     SECTION("inserts") {
         struct obj_t {
             obj_t(int i) : i(i) {}
             int i;
+
+            bool operator<(const obj_t& o) const {
+                return i < o.i;
+            }
         };
 
         using map_t = flat_map<int, obj_t>;