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

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

File:

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

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;