Changeset c300bb5 in mainline for uspace/lib/cpp/include/impl/list.hpp

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

7452b155

Parents:

bb1d15c

git-author:

Dzejrou <dzejrou@…> (2018-05-17 00:49:32)

git-committer:

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

Message:

cpp: added list modifiers tests and fixed bugs found by htem

File:

• uspace/lib/cpp/include/impl/list.hpp (modified) (5 diffs)

uspace/lib/cpp/include/impl/list.hpp

@@ -71 +71 @@
 
                 list_const_iterator(const list_iterator<T>& other)
-                    : current_{other.current_}, head_{other.head_}
+                    : current_{other.node()}, head_{other.head()}
                 { /* DUMMY BODY */ }
 
@@ -125 +125 @@
                 list_node<value_type>* node()
                 {
+                    return const_cast<list_node<value_type>*>(current_);
+                }
+
+                const list_node<value_type>* node() const
+                {
                     return current_;
                 }
 
-                const list_node<value_type>* node() const
-                {
-                    return current_;
+                list_node<value_type>* head()
+                {
+                    return const_cast<list_node<value_type>*>(head_);
+                }
+
+                const list_node<value_type>* head() const
+                {
+                    return head_;
                 }
 
@@ -154 +164 @@
 
             private:
-                list_node<value_type>* current_;
-                list_node<value_type>* head_;
+                const list_node<value_type>* current_;
+                const list_node<value_type>* head_;
                 bool end_;
         };
@@ -253 +263 @@
                 }
 
-                operator list_const_iterator<T>() const
-                {
-                    return list_const_iterator<T>{current_};
+                list_node<value_type>* head()
+                {
+                    return head_;
+                }
+
+                const list_node<value_type>* head() const
+                {
+                    return head_;
                 }
 
@@ -746 +761 @@
 
                 auto first_node = first.node();
-                auto last_node = last.node();
+                auto last_node = last.node()->prev;
                 auto prev = first_node->prev;
                 auto next = last_node->next;
 
-                prev->append(next);
-
-                while (first_node != next)
-                {
-                    // TODO: test with head in the range
-                    /* if (first_node == head_) */
-                    /*     head_ = last.node()->next; */
+                first_node->prev = nullptr;
+                last_node->next = nullptr;
+                prev->next = next;
+                next->prev = prev;
+
+                while (first_node)
+                {
+                    if (first_node == head_)
+                    {
+                        head_ = next;
+                        head_->prev = prev;
+                    }
 
                     auto tmp = first_node;