Changeset ed81b1f in mainline

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

e502572b

Parents:

2d302d6

git-author:

Jaroslav Jindrak <dzejrou@…> (2017-11-01 19:07:07)

git-committer:

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

Message:

cpp: finished std::string::insert tests and fixed some problems with length and other bugs revealed by the tests

Location:

uspace/lib/cpp

Files:

• include/impl/string.hpp (modified) (6 diffs)
• src/internal/test/string.cpp (modified) (4 diffs)

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

@@ -331 +331 @@
                 : data_{}, size_{}, capacity_{}, allocator_{alloc}
             {
-                init_(str, traits_type::length(str) + 1);
+                init_(str, traits_type::length(str));
             }
 
@@ -361 +361 @@
                 {
                     auto len = static_cast<size_type>(last - first);
-                    init_(static_cast<value_type*>(first), len);
+                    init_(first, len);
                 }
             }
@@ -501 +501 @@
             size_type length() const noexcept
             {
-                return size_;
+                return size();
             }
 
@@ -652 +652 @@
                 // TODO: if (size_ + n > max_size()) throw length_error
                 ensure_free_space_(n);
-                traits_type::copy(data_ + size_ - 1, str, n);
-                size_ += n - 1; // We are not copying str's null terminator.
+                traits_type::copy(data_ + size(), str, n);
+                size_ += n;
                 ensure_null_terminator_();
 
@@ -661 +661 @@
             basic_string& append(const value_type* str)
             {
-                return append(str, traits_type::length(str) + 1);
+                return append(str, traits_type::length(str));
             }
 
@@ -769 +769 @@
 
                 copy_backward_(begin() + pos, end(), end() + n);
-                std::printf("|%s|\n", data_);
                 copy_(str, str + n, begin() + pos);
                 size_ += n;

uspace/lib/cpp/src/internal/test/string.cpp

@@ -55 +55 @@
         test_eq(
             "size of string",
-            str1.size(), 6ul
+            str1.size(), 5ul
         );
         test_eq(
             "initialization from a cstring literal",
             str1.begin(), str1.end(),
-            check1, check1 + 6
+            check1, check1 + 5
         );
 
@@ -140 +140 @@
 
         std::string str5{"hello, "};
-        str5.append({'w', 'o', 'r', 'l', 'd', '\0'});
+        str5.append({'w', 'o', 'r', 'l', 'd'});
         test_eq(
             "append initializer list",
@@ -187 +187 @@
         std::string insertee{"ello"};
         str4.insert(str4.begin() + 1, insertee.begin(),
-                    insertee.end() - 1);
+                    insertee.end());
         test_eq(
             "insert iterator range",
@@ -193 +193 @@
             check.begin(), check.end()
         );
-        /* std::printf("|%s|\n", str4.c_str()); */
+
+        std::string str5{"hel, world"};
+        std::initializer_list<char> init{'l', 'o'};
+        str5.insert(str5.begin() + 3, init);
+        test_eq(
+            "insert initializer list",
+            str5.begin(), str5.end(),
+            check.begin(), check.end()
+        );
     }
 }