Changeset 2d302d6 in mainline

Timestamp:

2018-07-05T21:41:18Z (6 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

ed81b1f

Parents:

d7f0b3f7

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-10-31 22:31:32)

git-committer:

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

Message:

cpp: fixed bugs found by the insert tests

File:

• uspace/lib/cpp/include/impl/string.hpp (modified) (11 diffs)

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

@@ -64 +64 @@
         /* using state_type = mbstate_t; */
 
-        static void assign(char_type& c1, char_type& c2) noexcept
+        static void assign(char_type& c1, const char_type& c2) noexcept
         {
             c1 = c2;
@@ -86 +86 @@
         static size_t length(const char_type* s)
         {
-            return std::str_size(s) + 1;
+            return std::str_size(s);
         }
 
@@ -167 +167 @@
         /* using state_type = mbstate_t; */
 
-        static void assign(char_type& c1, char_type& c2) noexcept
+        static void assign(char_type& c1, const char_type& c2) noexcept
         {
             c1 = c2;
@@ -191 +191 @@
         static size_t length(const char_type* s)
         {
-            return std::wstr_size(s) + 1;
+            return std::wstr_size(s);
         }
 
@@ -331 +331 @@
                 : data_{}, size_{}, capacity_{}, allocator_{alloc}
             {
-                init_(str, traits_type::length(str));
+                init_(str, traits_type::length(str) + 1);
             }
 
@@ -661 +661 @@
             basic_string& append(const value_type* str)
             {
-                return append(str, traits_type::length(str));
+                return append(str, traits_type::length(str) + 1);
             }
 
@@ -764 +764 @@
             basic_string& insert(size_type pos, const value_type* str, size_type n)
             {
-                ensure_free_space_(size_ + n);
+                // TODO: throw out_of_range if pos > size()
+                // TODO: throw length_error if size() + n > max_size()
+                ensure_free_space_(n);
+
                 copy_backward_(begin() + pos, end(), end() + n);
-                copy_(begin() + pos, begin() + pos + n, str);
-
+                std::printf("|%s|\n", data_);
+                copy_(str, str + n, begin() + pos);
+                size_ += n;
+
+                ensure_null_terminator_();
                 return *this;
             }
@@ -786 +792 @@
 
                 ensure_free_space_(1);
-                copy_backward_(begin() + pos, end(), end() + 1);
+                copy_backward_(begin() + idx, end(), end() + 1);
+                traits_type::assign(data_[idx], c);
+
+                ++size_;
                 ensure_null_terminator_();
 
@@ -800 +809 @@
 
                 ensure_free_space_(n);
-                copy_backward_(begin() + pos, end(), end() + n);
-
-                auto it = pos;
+                copy_backward_(begin() + idx, end(), end() + n);
+
+                auto it = begin() + idx;
                 for (size_type i = 0; i < n; ++i)
                     traits_type::assign(*it++, c);
+                size_ += n;
                 ensure_null_terminator_();
 
@@ -814 +824 @@
                             InputIterator last)
             {
-                return insert(pos - begin(), basic_string(first, last));
+                if (first == last)
+                    return const_cast<iterator>(pos);
+
+                auto idx = static_cast<size_type>(pos - begin());
+                auto str = basic_string{first, last};
+                insert(idx, str);
+
+                return begin() + idx;
             }
 
@@ -1337 +1354 @@
             }
 
-            iterator copy_(const_iterator first, const_iterator last,
-                           iterator result)
+            template<class Iterator1, class Iterator2>
+            Iterator2 copy_(Iterator1 first, Iterator1 last,
+                            Iterator2 result)
             {
                 while (first != last)
                     traits_type::assign(*result++, *first++);
 
-                ensure_null_terminator_();
                 return result;
             }
 
-            iterator copy_backward_(const_iterator first, const_iterator last,
-                                    iterator result)
-            {
-                while (last-- != first)
-                    traits_type::assign(*result--, *last);
-
-                ensure_null_terminator_();
+            template<class Iterator1, class Iterator2>
+            Iterator2 copy_backward_(Iterator1 first, Iterator1 last,
+                                     Iterator2 result)
+            {
+                while (last != first)
+                    traits_type::assign(*--result, *--last);
+
                 return result;
             }