Changeset 7452b155 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:

91ac0bb

Parents:

c300bb5

git-author:

Dzejrou <dzejrou@…> (2018-05-17 16:51:33)

git-committer:

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

Message:

cpp: added the rest of list tests and fixed bugs found by them

Location:

uspace/lib/cpp

Files:

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

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

@@ -71 +71 @@
 
                 list_const_iterator(const list_iterator<T>& other)
-                    : current_{other.node()}, head_{other.head()}
+                    : current_{other.node()}, head_{other.head()}, end_{other.end()}
                 { /* DUMMY BODY */ }
 
@@ -307 +307 @@
         template<class T>
         bool operator!=(const list_iterator<T>& lhs, const list_iterator<T>& rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        template<class T>
+        bool operator==(const list_const_iterator<T>& lhs, const list_iterator<T>& rhs)
+        {
+            return (lhs.node() == rhs.node()) && (lhs.end() == rhs.end());
+        }
+
+        template<class T>
+        bool operator!=(const list_const_iterator<T>& lhs, const list_iterator<T>& rhs)
+        {
+            return !(lhs == rhs);
+        }
+
+        template<class T>
+        bool operator==(const list_iterator<T>& lhs, const list_const_iterator<T>& rhs)
+        {
+            return (lhs.node() == rhs.node()) && (lhs.end() == rhs.end());
+        }
+
+        template<class T>
+        bool operator!=(const list_iterator<T>& lhs, const list_const_iterator<T>& rhs)
         {
             return !(lhs == rhs);
@@ -874 +898 @@
                     return;
 
-                if (first.node() == other.head_ && !last.node())
+                if (first == other.begin() && last == other.end())
                 { // [first, last) is everything in other.
                     splice(position, other);
@@ -884 +908 @@
                 aux::list_node<value_type>* last_node{};
 
-                if (first.node() == other.head_)
+                if (first == other.begin())
                 { // The range is a prefix of other.
                     other.head_ = last.node();
@@ -893 +917 @@
                     last_node = last.node()->prev;
                 }
-                else if (!last.node())
+                else if (last == other.end())
                 { // The range is a suffix of other.
                     auto new_last = first.node()->prev;
@@ -928 +952 @@
                 }
 
-                auto count = distance(iterator{first_node}, iterator{last_node});
+                auto count = distance(
+                    iterator{first_node, nullptr, false},
+                    iterator{last_node, nullptr, false}
+                );
+                ++count;
+
                 size_ += count;
                 other.size_ -= count;

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

@@ -237 +237 @@
         test_eq("clear empty", l1.empty(), true);
         test_eq("clear size", l1.size(), 0U);
+
+        std::list<int> l2{1, 2, 3, 4, 5};
+        std::list<int> l3{10, 20, 30, 40, 50};
+
+        auto check6 = {1, 2, 10, 20, 30, 40, 50, 3, 4, 5};
+        auto check7 = {1, 2, 10, 20, 30, 40, 50};
+        auto check8 = {3, 4, 5};
+
+        auto it6 = l2.begin();
+        std::advance(it6, 2);
+
+        l2.splice(it6, l3);
+        test_eq(
+            "splice pt1",
+            check6.begin(), check6.end(),
+            l2.begin(), l2.end()
+        );
+        test_eq("splice pt2", l3.empty(), true);
+
+        l3.splice(l3.begin(), l2, it6, l2.end());
+        test_eq(
+            "splice pt3",
+            check7.begin(), check7.end(),
+            l2.begin(), l2.end()
+        );
+        test_eq(
+            "splice pt4",
+            check8.begin(), check8.end(),
+            l3.begin(), l3.end()
+        );
+        test_eq("splice size pt1", l2.size(), 7U);
+        test_eq("splice size pt2", l3.size(), 3U);
+
+        auto check9 = {1, -1, 2, -2, 3, -3, 4, -4};
+        auto check10 = {1, 2, 3, 4};
+        std::list<int> l4{1, -1, 2, 5, -2, 5, 3, -3, 5, 4, -4};
+
+        l4.remove(5);
+        test_eq(
+            "remove",
+            check9.begin(), check9.end(),
+            l4.begin(), l4.end()
+        );
+        test_eq("remove size", l4.size(), 8U);
+
+        l4.remove_if([](auto x){ return x < 0; });
+        test_eq(
+            "remove_if",
+            check10.begin(), check10.end(),
+            l4.begin(), l4.end()
+        );
+        test_eq("remove_if size", l4.size(), 4U);
+
+        auto check11 = {1, 2, 3, 2, 4, 5};
+        std::list<int> l5{1, 1, 2, 3, 3, 2, 2, 4, 5, 5};
+
+        l5.unique();
+        test_eq(
+            "unique",
+            check11.begin(), check11.end(),
+            l5.begin(), l5.end()
+        );
+        test_eq("unique size", l5.size(), 6U);
+
+        auto check12 = {1, 3, 3, 5, 7, 9, 9};
+        std::list<int> l6{1, 3, 3, 4, 4, 5, 6, 6, 6, 7, 8, 9, 9};
+
+        l6.unique([](auto lhs, auto rhs){ return lhs == rhs + 1; });
+        test_eq(
+            "unique predicate",
+            check12.begin(), check12.end(),
+            l6.begin(), l6.end()
+        );
+        test_eq("unique predicate size", l6.size(), 7U);
     }
 }