Changeset 99bf4c4 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

e037873d

Parents:

379ce989

git-author:

Dzejrou <dzejrou@…> (2018-04-25 21:31:27)

git-committer:

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

Message:

cpp: removed unnecessary key_extractor_ uses, rendunant increments that can be avoided with do/while instead of while, added keys_equal for constant context

File:

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

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

@@ -171 +171 @@
             do
             {
-                if (table.key_eq_(key, table.key_extractor_(current->value)))
+                if (table.keys_equal(key, current->value))
                 {
                     --table.size_;
@@ -200 +200 @@
             typename Table::iterator,
             typename Table::iterator
-        > equal_range(const Table& table, const Key& key)
+        > equal_range(Table& table, const Key& key)
         {
             auto it = table.find(key);
@@ -230 +230 @@
             do
             {
-                if (table.key_eq_(key, table.key_extractor_(current->value)))
+                if (table.keys_equal(key, current->value))
                     ++res;
 
@@ -251 +251 @@
                 do
                 {
-                    if (table.keys_equal(key, table.get_key(current->value)))
+                    if (table.keys_equal(key, current->value))
                     {
                         return make_tuple(
@@ -280 +280 @@
             while (it != table.end(it))
             {
-                if (table.keys_equal(key, table.get_key(*it)))
+                if (table.keys_equal(key, *it))
                 {
-                    while (table.keys_equal(key, table.get_key(*it)))
+                    while (table.keys_equal(key, *it))
                     {
                         auto node = it.node();
@@ -307 +307 @@
             typename Table::iterator,
             typename Table::iterator
-        > equal_range(const Table& table, const Key& key)
+        > equal_range(Table& table, const Key& key)
         {
             auto first = table.find(key);
@@ -314 +314 @@
 
             auto last = first;
-            while (table.keys_equal(key, table.get_key(*last)))
+            do
+            {
                 ++last;
-
-            // The second iterator points one behind the range.
-            ++last;
+            } while (table.keys_equal(key, *last));
 
             return make_pair(first, last);
@@ -334 +333 @@
 
             auto last = first;
-            while (table.keys_equal(key, table.get_key(*last)))
+            do
+            {
                 ++last;
-
-            // The second iterator points one behind the range.
-            ++last;
+            } while (table.keys_equal(key, *last));
 
             return make_pair(first, last);
@@ -1217 +1215 @@
             }
 
+            bool keys_equal(const key_type& key, const value_type& val) const
+            {
+                return key_eq_(key, key_extractor_(val));
+            }
+
             hash_table_bucket<value_type, size_type>* table()
             {