Changeset 53e8686 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:

173a246

Parents:

d466d284

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-01 20:30:32)

git-committer:

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

Message:

cpp: minor refactoring, fixed some bugs found by the replace tests

File:

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

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

@@ -339 +339 @@
                 data_ = allocator_.allocate(capacity_);
                 for (size_type i = 0; i < size_; ++i)
-                    traits_type::asign(data_[i], c);
+                    traits_type::assign(data_[i], c);
                 ensure_null_terminator_();
             }
@@ -888 +888 @@
                                   size_type n2)
             {
-                // TODO: format and comment this properly
                 // TODO: throw out_of_range if pos > size()
+                // TODO: if size() - len > max_size() - n2 throw length_error
                 auto len = min(n1, size_ - pos);
-                // TODO: if size() - len > max_size() - n2 throw length_error
+
                 basic_string tmp{};
                 tmp.resize_without_copy_(size_ - len + n2);
+
+                // Prefix.
                 copy_(begin(), begin() + pos, tmp.begin());
-                traits_type::copy(tmp.begin() + pos + 1, str, n2);
-                copy_(begin() + pos + len, end(), tmp.begin() + pos + 1 + n2);
+
+                // Substitution.
+                traits_type::copy(tmp.begin() + pos, str, n2);
+
+                // Suffix.
+                copy_(begin() + pos + len, end(), tmp.begin() + pos + n2);
+
+                tmp.size_ = size_ - len + n2;
                 swap(tmp);
                 return *this;
@@ -960 +968 @@
             void swap(basic_string& other)
                 noexcept(allocator_traits<allocator_type>::propagate_on_container_swap::value ||
-                         allocator_traits<allocator_type>::is_always_equal)
+                         allocator_traits<allocator_type>::is_always_equal::value)
             {
                 std::swap(data_, other.data_);