lazy_push_front and push_front no longer have unnecessary forward_linked_list and bidirectional_linked_list dependencies.

Author: davidstone

source/containers/CMakeLists.txt

@@ -255,10 +255,12 @@ target_sources(containers_test PRIVATE
 		test/insert.cpp
 		test/lazy_push_back.cpp
 		test/lazy_push_back_into_capacity.cpp
+		test/lazy_push_front.cpp
 		test/linear_map.cpp
 		test/pop_back.cpp
 		test/push_back.cpp
 		test/push_back_into_capacity.cpp
+		test/push_front.cpp
 		test/range_view.cpp
 		test/shrink_to_fit.cpp
 		test/stable_vector.cpp

source/containers/lazy_push_front.cpp

@@ -5,25 +5,19 @@
 
 module;
 
-#include <bounded/assert.hpp>
-
 #include <operators/forward.hpp>
 
 export module containers.lazy_push_front;
 
 import containers.algorithms.splice;
 import containers.begin_end;
-import containers.bidirectional_linked_list;
-import containers.forward_linked_list;
 import containers.front;
 import containers.lazy_push_back;
 import containers.range_value_t;
 import containers.splicable;
 import containers.supports_lazy_insert_after;
 
 import bounded;
-import bounded.test_int;
-import std_module;
 
 namespace containers {
 
@@ -49,27 +43,3 @@ constexpr auto lazy_push_front(
 }
 
 } // namespace containers
-
-using namespace bounded::literal;
-
-template<typename Container>
-constexpr auto test_lazy_push_front() -> bool {
-	auto c = Container();
-
-	containers::lazy_push_front(c, bounded::value_to_function(3));
-	BOUNDED_ASSERT(c == Container({3}));
-
-	containers::lazy_push_front(c, bounded::value_to_function(4));
-	BOUNDED_ASSERT(c == Container({4, 3}));
-
-	containers::lazy_push_front(c, bounded::value_to_function(5));
-	BOUNDED_ASSERT(c == Container({5, 4, 3}));
-
-	containers::lazy_push_front(c, bounded::value_to_function(12));
-	BOUNDED_ASSERT(c == Container({12, 5, 4, 3}));
-
-	return true;
-}
-
-static_assert(test_lazy_push_front<containers::bidirectional_linked_list<bounded_test::non_copyable_integer>>());
-static_assert(test_lazy_push_front<containers::forward_linked_list<bounded_test::non_copyable_integer>>());

source/containers/push_front.cpp

@@ -3,20 +3,13 @@
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 
-module;
-
-#include <bounded/assert.hpp>
-
 export module containers.push_front;
 
-import containers.bidirectional_linked_list;
-import containers.forward_linked_list;
 import containers.front;
 import containers.lazy_push_front;
 import containers.range_value_t;
 
 import bounded;
-import bounded.test_int;
 import std_module;
 
 namespace containers {
@@ -55,22 +48,3 @@ constexpr auto push_front(Container & container, range_value_t<Container> && val
 }
 
 } // namespace containers
-
-template<typename Container>
-constexpr auto test_push_front() -> bool {
-	// TODO: Why is this line necessary?
-	static_assert(containers::lazy_push_frontable<Container>);
-	auto v = Container();
-	containers::push_front(v, 0);
-	BOUNDED_ASSERT(v == Container({0}));
-	containers::push_front(v, 1);
-	BOUNDED_ASSERT(v == Container({1, 0}));
-	containers::push_front(v, 2);
-	BOUNDED_ASSERT(v == Container({2, 1, 0}));
-	containers::push_front(v, 3);
-	BOUNDED_ASSERT(v == Container({3, 2, 1, 0}));
-	return true;
-}
-
-static_assert(test_push_front<containers::bidirectional_linked_list<bounded_test::non_copyable_integer>>());
-static_assert(test_push_front<containers::forward_linked_list<bounded_test::non_copyable_integer>>());

source/containers/test/lazy_push_front.cpp

@@ -0,0 +1,41 @@
+// Copyright David Stone 2022.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+module;
+
+#include <bounded/assert.hpp>
+
+export module containers.test.lazy_push_front;
+
+import containers.bidirectional_linked_list;
+import containers.forward_linked_list;
+import containers.lazy_push_front;
+
+import bounded;
+import bounded.test_int;
+
+using namespace bounded::literal;
+
+template<typename Container>
+constexpr auto test_lazy_push_front() -> bool {
+	auto c = Container();
+
+	containers::lazy_push_front(c, bounded::value_to_function(3));
+	BOUNDED_ASSERT(c == Container({3}));
+
+	containers::lazy_push_front(c, bounded::value_to_function(4));
+	BOUNDED_ASSERT(c == Container({4, 3}));
+
+	containers::lazy_push_front(c, bounded::value_to_function(5));
+	BOUNDED_ASSERT(c == Container({5, 4, 3}));
+
+	containers::lazy_push_front(c, bounded::value_to_function(12));
+	BOUNDED_ASSERT(c == Container({12, 5, 4, 3}));
+
+	return true;
+}
+
+static_assert(test_lazy_push_front<containers::bidirectional_linked_list<bounded_test::non_copyable_integer>>());
+static_assert(test_lazy_push_front<containers::forward_linked_list<bounded_test::non_copyable_integer>>());

source/containers/test/push_front.cpp

@@ -0,0 +1,39 @@
+// Copyright David Stone 2022.
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+module;
+
+#include <bounded/assert.hpp>
+
+export module containers.test.push_front;
+
+import containers.push_front;
+
+import containers.bidirectional_linked_list;
+import containers.forward_linked_list;
+import containers.front;
+import containers.lazy_push_front;
+import containers.range_value_t;
+
+import bounded;
+import bounded.test_int;
+import std_module;
+
+template<typename Container>
+constexpr auto test_push_front() -> bool {
+	auto v = Container();
+	containers::push_front(v, 0);
+	BOUNDED_ASSERT(v == Container({0}));
+	containers::push_front(v, 1);
+	BOUNDED_ASSERT(v == Container({1, 0}));
+	containers::push_front(v, 2);
+	BOUNDED_ASSERT(v == Container({2, 1, 0}));
+	containers::push_front(v, 3);
+	BOUNDED_ASSERT(v == Container({3, 2, 1, 0}));
+	return true;
+}
+
+static_assert(test_push_front<containers::bidirectional_linked_list<bounded_test::non_copyable_integer>>());
+static_assert(test_push_front<containers::forward_linked_list<bounded_test::non_copyable_integer>>());