Changeset 86b3ae98 in mainline for uspace/lib/cpp/include/internal/hash_table.hpp

Timestamp:

2018-07-05T21:41:21Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

86d1939

Parents:

b044f66

git-author:

Dzejrou <dzejrou@…> (2018-04-24 21:12:20)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:21)

Message:

cpp: fixed semantic errors, added support functions for higher level containers

File:

• uspace/lib/cpp/include/internal/hash_table.hpp (modified) (5 diffs)

uspace/lib/cpp/include/internal/hash_table.hpp

@@ -53 +53 @@
     struct key_value_key_extractor
     {
-        Key& operator()(pair<Key, Value>& p) const noexcept
-        {
-            return p.first;
-        }
-
-        const Key& operator()(pair<const Key, Value>& p) const noexcept
+        const Key& operator()(const pair<const Key, Value>& p) const noexcept
         {
             return p.first;
@@ -201 +196 @@
         {
             auto it = table.find(key);
-            return make_pair(it, it);
+            return make_pair(it, ++it);
         }
 
@@ -211 +206 @@
         { // Note: We cannot overload by return type, so we use a different name.
             auto it = table.find(key);
-            return make_pair(it, it);
+            return make_pair(it, ++it);
         }
     };
@@ -705 +700 @@
             using const_local_iterator = ConstLocalIterator;
 
+            using node_type = list_node<value_type>;
+
             using hint_type = tuple<
                 hash_table_bucket<value_type, size_type>*,
@@ -1102 +1099 @@
             }
 
-            hasher hash_function() const
-            {
-                return hasher_;
-            }
-
-            key_equal key_eq() const
-            {
-                return key_eq_;
-            }
-
-        /* private: */
+            bool keys_equal(const key_type& key, const value_type& val)
+            {
+                return key_eq_(key, key_extractor_(val));
+            }
+
+            hash_table_bucket<value_type, size_type>* table()
+            {
+                return table_;
+            }
+
+            hash_table_bucket<value_type, size_type>* head(size_type idx)
+            {
+                if (idx < bucket_count_)
+                    return &table_[idx];
+                else
+                    return nullptr;
+            }
+
+        private:
             hash_table_bucket<value_type, size_type>* table_;
             size_type bucket_count_;