Changeset c300bb5 in mainline

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

Location:

uspace/lib/cpp

Files:

• include/__bits/test/tests.hpp (modified) (1 diff)
• include/impl/list.hpp (modified) (5 diffs)
• src/__bits/test/list.cpp (modified) (2 diffs)

uspace/lib/cpp/include/__bits/test/tests.hpp

@@ -265 +265 @@
         private:
             void test_construction_and_assignment();
+            void test_modifiers();
     };
 }

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;

uspace/lib/cpp/src/__bits/test/list.cpp

@@ -40 +40 @@
 
         test_construction_and_assignment();
+        test_modifiers();
 
         return end();
@@ -152 +153 @@
         test_eq("back", l5.back(), 1);
     }
+
+    void list_test::test_modifiers()
+    {
+        std::list<int> l1{};
+        test_eq("empty list", l1.empty(), true);
+
+        l1.push_back(1);
+        test_eq("empty list push_back pt1", l1.size(), 1U);
+        test_eq("empty list push_back pt2", l1.empty(), false);
+        test_eq("empty list push_back pt3", l1.front(), 1);
+        test_eq("empty list push_back pt4", l1.back(), 1);
+
+        l1.push_front(2);
+        test_eq("push_front pt1", l1.size(), 2U);
+        test_eq("push_front pt2", l1.front(), 2);
+        test_eq("push_front pt3", l1.back(), 1);
+
+        l1.pop_back();
+        test_eq("pop_back pt1", l1.size(), 1U);
+        test_eq("pop_back pt2", l1.back(), 2);
+
+        l1.push_front(3);
+        test_eq("size", l1.size(), 2U);
+
+        l1.pop_front();
+        test_eq("pop_front", l1.front(), 2);
+
+        auto check1 = {2, 42, 42, 42, 42, 42};
+        l1.insert(l1.begin(), 5U, 42);
+        test_eq(
+            "insert n*value",
+            check1.begin(), check1.end(),
+            l1.begin(), l1.end()
+        );
+
+        auto data1 = {33, 34};
+        auto check2 = {2, 42, 33, 34, 42, 42, 42, 42};
+        auto it1 = l1.begin();
+        std::advance(it1, 2);
+
+        l1.insert(it1, data1.begin(), data1.end());
+        test_eq(
+            "insert iterator range",
+            check2.begin(), check2.end(),
+            l1.begin(), l1.end()
+        );
+
+        auto check3 = {2, 42, 33, 34, 42, 33, 34, 42, 42, 42};
+        auto it2 = l1.begin();
+        std::advance(it2, 5);
+
+        l1.insert(it2, data1);
+        test_eq(
+            "insert initializer_list",
+            check3.begin(), check3.end(),
+            l1.begin(), l1.end()
+        );
+
+        auto check4 = {2, 42, 33, 34, 33, 34, 42, 42, 42};
+        auto it3 = l1.begin();
+        std::advance(it3, 4);
+
+        l1.erase(it3);
+        test_eq(
+            "erase iterator",
+            check4.begin(), check4.end(),
+            l1.begin(), l1.end()
+        );
+
+        auto check5 = {33, 34, 42, 42, 42};
+        auto it4 = l1.begin();
+        auto it5 = l1.begin();
+        std::advance(it5, 4);
+
+        l1.erase(it4, it5);
+        test_eq(
+            "erase iterator range",
+            check5.begin(), check5.end(),
+            l1.begin(), l1.end()
+        );
+
+        l1.clear();
+        test_eq("clear empty", l1.empty(), true);
+        test_eq("clear size", l1.size(), 0U);
+    }
 }