Merge pull request #14 from winner245/winner245/dev

Winner245/dev

Author: archibate

.gitignore

@@ -1,3 +1,4 @@
 .cache/
 build/
 out/
+.vscode/

Array.hpp

@@ -120,28 +120,28 @@ struct Array {
         return _M_elements + _N;
     }
 
-    std::reverse_iterator<_Tp const *> crbegin() const noexcept {
-        return std::make_reverse_iterator(_M_elements);
+    const_reverse_iterator crbegin() const noexcept {
+        return const_reverse_iterator(end());
     }
 
-    std::reverse_iterator<_Tp const *> crend() const noexcept {
-        return std::make_reverse_iterator(_M_elements + _N);
+    const_reverse_iterator crend() const noexcept {
+        return const_reverse_iterator(begin());
     }
 
-    std::reverse_iterator<_Tp const *> rbegin() const noexcept {
-        return std::make_reverse_iterator(_M_elements);
+    const_reverse_iterator rbegin() const noexcept {
+        return const_reverse_iterator(end());
     }
 
-    std::reverse_iterator<_Tp const *> rend() const noexcept {
-        return std::make_reverse_iterator(_M_elements + _N);
+    const_reverse_iterator rend() const noexcept {
+        return const_reverse_iterator(begin());
     }
 
-    std::reverse_iterator<_Tp *> rbegin() noexcept {
-        return std::make_reverse_iterator(_M_elements);
+    reverse_iterator rbegin() noexcept {
+        return reverse_iterator(end());
     }
 
-    std::reverse_iterator<_Tp *> rend() noexcept {
-        return std::make_reverse_iterator(_M_elements + _N);
+    reverse_iterator rend() noexcept {
+        return reverse_iterator(begin());
     }
 
     _LIBPENGCXX_DEFINE_COMPARISON(Array);
@@ -273,5 +273,5 @@ struct Array<_Tp, 0> {
 };
 
 
-template <class _Tp, class ..._Ts>
-Array(_Tp, _Ts...) -> Array<_Tp, 1 + sizeof...(_Ts)>;
+template <class _Tp, class ..._Ts> 
+Array(_Tp, _Ts...) -> Array<std::enable_if_t<(std::is_same_v<_Tp, _Ts> && ...), _Tp>, 1 + sizeof...(_Ts)>;

List.hpp

@@ -61,7 +61,7 @@ struct List {
 
     void deleteNode(ListNode *node) noexcept {
         AllocNode allocNode{m_alloc};
-        std::allocator_traits<AllocNode>::deallocate(allocNode, static_cast<ListValueNode<T> *>(node));
+        std::allocator_traits<AllocNode>::deallocate(allocNode, static_cast<ListValueNode<T> *>(node), 1);
     }
 
 public:
@@ -114,8 +114,8 @@ struct List {
         assign(that.cbegin(), that.cend());
     }
 
-    bool empty() noexcept {
-        return m_dummy.m_prev == m_dummy.m_next;
+    bool empty() const noexcept {
+        return m_dummy.m_next == &m_dummy;
     }
 
     T &front() noexcept {
@@ -178,30 +178,16 @@ struct List {
         prev->m_next = &m_dummy;
     }
 
-    void _uninit_assign(size_t n, T const &val) {
+    template<typename... Args>
+    requires std::constructible_from<value_type, Args...>
+    void _uninit_assign(size_t n, Args&&... args) {
         ListNode *prev = &m_dummy;
-        while (n) {
-            ListNode *node = newNode();
-            prev->m_next = node;
-            node->m_prev = prev;
-            std::construct_at(&node->value(), val);
-            prev = node;
-            --n;
-        }
-        m_dummy.m_prev = prev;
-        prev->m_next = &m_dummy;
-        m_size = n;
-    }
-
-    void _uninit_assign(size_t n) {
-        ListNode *prev = &m_dummy;
-        while (n) {
+        for (size_t i = 0; i < n; ++i) {
             ListNode *node = newNode();
             prev->m_next = node;
             node->m_prev = prev;
-            std::construct_at(&node->value());
+            std::construct_at(&node->value(), std::forward<Args>(args)...);
             prev = node;
-            --n;
         }
         m_dummy.m_prev = prev;
         prev->m_next = &m_dummy;
@@ -213,7 +199,7 @@ struct List {
         return m_size;
     }
 
-    static constexpr std::size_t max_size() noexcept {
+    constexpr std::size_t max_size() const noexcept {
         return std::numeric_limits<std::size_t>::max();
     }
 
@@ -345,7 +331,7 @@ struct List {
 
         iterator operator--(int) noexcept { // iterator--
             auto tmp = *this;
-            ++*this;
+            --*this;
             return tmp;
         }
 

test_Array.cpp

@@ -47,5 +47,9 @@ int main() {
     }
     std::cout << "front:" << a.front() << '\n';
     std::cout << "back:" << a.back() << '\n';
+    for (auto it = a.rbegin(); it != a.rend(); ++it) {
+        std::cout << *it << " ";
+    }
+    std::cout << '\n';
     return 0;
 }

test_List.cpp

@@ -31,4 +31,12 @@ int main() {
         printf("arr[%zd] = %d\n", i, val);
     }
     printf("arr.size() = %zd\n", arr.size());
+    arr2.erase(++arr2.begin(), arr2.end());
+    std::cout << std::boolalpha << "arr2.size() = " << arr2.size()
+              << ", arr2.empty() = " << arr2.empty() << '\n';
+    arr2.erase(arr2.begin());
+    std::cout << std::boolalpha << "arr2.size() = " << arr2.size()
+              << ", arr2.empty() = " << arr2.empty() << '\n';
+    List<int> arr3(3);
+    std::cout << arr3.size() << '\n';
 }