[inplace_vector] Improve resize; test resize/reserve/shrink_to_fit

Quuxplusone · Oct 20, 2023 · 26c1acd · 26c1acd
1 parent 0a0da7b
commit 26c1acd
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 3 deletions.
diff --git a/include/sg14/inplace_vector.h b/include/sg14/inplace_vector.h
@@ -250,13 +250,15 @@ class inplace_vector : ipvbase_assignable<T>, ipvbase_t<T, N> {
             }
             std::destroy(data() + n, data() + size_);
             set_size_(n);
+        } else if (n > N) {
+            SG14_INPLACE_VECTOR_THROW(std::bad_alloc());
         } else {
             size_t m = size_;
             for (size_t i = 0; i < m; ++i) {
                 (*this)[i] = value;
             }
             for (size_t i = m; i < n; ++i) {
-                push_back(value);
+                unchecked_push_back(value);
             }
         }
     }
@@ -324,19 +326,23 @@ class inplace_vector : ipvbase_assignable<T>, ipvbase_t<T, N> {
     constexpr void resize(size_type n) {
         if (n < size_) {
             erase(begin() + n, end());
+        } else if (n > N) {
+            SG14_INPLACE_VECTOR_THROW(std::bad_alloc());
         } else {
             for (size_t i = n - size_; i != 0; --i) {
-                emplace_back();
+                unchecked_emplace_back();
             }
         }
     }
 
     constexpr void resize(size_type n, const value_type& value) {
         if (n < size_) {
             erase(begin() + n, end());
+        } else if (n > N) {
+            SG14_INPLACE_VECTOR_THROW(std::bad_alloc());
         } else {
             for (size_t i = n - size_; i != 0; --i) {
-                push_back(value);
+                unchecked_push_back(value);
             }
         }
     }

diff --git a/test/inplace_vector_test.cpp b/test/inplace_vector_test.cpp
@@ -1256,4 +1256,37 @@ TEST(inplace_vector, Comparison)
 #endif
 }
 
+TEST(inplace_vector, Reserve)
+{
+    sg14::inplace_vector<int, 10> v = {1,2,3};
+    v.reserve(0);
+    EXPECT_EQ(v.capacity(), 10u);
+    v.reserve(5);
+    EXPECT_EQ(v.capacity(), 10u);
+    v.reserve(10);
+    EXPECT_EQ(v.capacity(), 10u);
+    ASSERT_THROW(v.reserve(11), std::bad_alloc);
+    v.shrink_to_fit();
+    EXPECT_EQ(v.capacity(), 10u);
+    EXPECT_EQ(v, (sg14::inplace_vector<int, 10>{1,2,3}));
+}
+
+TEST(inplace_vector, Resize)
+{
+    sg14::inplace_vector<std::string, 4> v;
+    v.resize(2);
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{"", ""}));
+    v.resize(1, "a");
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{""}));
+    v.resize(3, "b");
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{"", "b", "b"}));
+    v.resize(4);
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{"", "b", "b", ""}));
+    v.resize(2, "c");
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{"", "b"}));
+    ASSERT_THROW(v.resize(5), std::bad_alloc);
+    ASSERT_THROW(v.resize(6, "d"), std::bad_alloc);
+    EXPECT_EQ(v, (sg14::inplace_vector<std::string, 4>{"", "b"})); // unchanged
+}
+
 #endif // __cplusplus >= 201703