Changeset 4f22d0c3 in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

cf573ec

Parents:

27f1bc0

git-author:

Dzejrou <dzejrou@…> (2018-05-13 23:27:05)

git-committer:

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

Message:

cpp: fixed end(), it was broken because of the change to node lists for multi tables

Location:

uspace/lib/cpp/include/internal

Files:

• rbtree.hpp (modified) (2 diffs)
• rbtree_node.hpp (modified) (4 diffs)

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

@@ -125 +125 @@
             iterator end()
             {
-                return iterator{find_largest_(), true};
+                /**
+                 * In case we have lists of nodes
+                 * we need to get the actual end
+                 * from the largest node.
+                 */
+                auto res = find_largest_();
+                if (res)
+                    return iterator{res->get_end(), true};
+                else
+                    return iterator{res, true};
             }
 
@@ -160 +169 @@
             const_iterator cend() const
             {
-                return const_iterator{find_largest_(), true};
+                auto res = find_largest_();
+                if (res)
+                    return const_iterator{res->get_end(), true};
+                else
+                    return const_iterator{res, true};
             }
 

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

@@ -401 +401 @@
             }
 
+            rbtree_single_node* get_end()
+            {
+                return this;
+            }
+
+            const rbtree_single_node* get_end() const
+            {
+                return this;
+            }
+
             ~rbtree_single_node()
             {
@@ -428 +438 @@
             rbtree_multi_node(Args&&... args)
                 : value{forward<Args>(args)...}, color{rbcolor::red},
-                  parent_{}, left_{}, right_{}, next_{}, first_{this}
-            { /* DUMMY BODY */ }
+                  parent_{}, left_{}, right_{}, next_{}, first_{}
+            {
+                first_ = this;
+            }
 
             rbtree_multi_node* parent() const
@@ -615 +627 @@
             }
 
+            rbtree_multi_node* get_end()
+            {
+                return const_cast<rbtree_multi_node*>(
+                    const_cast<const rbtree_multi_node*>(this)->get_end()
+                );
+            }
+
+            const rbtree_multi_node* get_end() const
+            {
+                if (!next_)
+                    return this;
+                else
+                {
+                    auto tmp = next_;
+                    while (tmp->next_)
+                        tmp = tmp->next_;
+
+                    return tmp;
+                }
+            }
+
             ~rbtree_multi_node()
             {
@@ -620 +653 @@
                 if (left_)
                     delete left_;
-                if (right)
+                if (right_)
                     delete right_;