Rename range_view to subrange to follow std naming terminology

Author: davidstone

source/containers/CMakeLists.txt

@@ -166,7 +166,6 @@ target_sources(containers PUBLIC
 		range_reference_t.cpp
 		range_size_t.cpp
 		range_value_t.cpp
-		range_view.cpp
 		reallocation_size.cpp
 		reference_or_value.cpp
 		repeat_n.cpp
@@ -186,6 +185,7 @@ target_sources(containers PUBLIC
 		static_vector.cpp
 		stored_function.cpp
 		string.cpp
+		subrange.cpp
 		subtractable.cpp
 		supports_lazy_insert_after.cpp
 		take.cpp
@@ -263,9 +263,9 @@ target_sources(containers_test PRIVATE
 		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
+		test/subrange.cpp
 		test/take.cpp
 		test/test_associative_container.cpp
 		test/test_reserve_and_capacity.cpp

source/containers/algorithms/binary_search.cpp

@@ -12,7 +12,7 @@ export module containers.algorithms.binary_search;
 import containers.algorithms.partition;
 import containers.begin_end;
 import containers.range;
-import containers.range_view;
+import containers.subrange;
 
 import std_module;
 
@@ -42,9 +42,9 @@ export constexpr auto upper_bound = upper_bound_t();
 struct equal_range_t {
 	static constexpr auto operator()(range auto && sorted, auto const & value, auto cmp) {
 		auto it = lower_bound(OPERATORS_FORWARD(sorted), value, cmp);
-		return range_view(
+		return subrange(
 			it,
-			upper_bound(range_view(it, containers::end(OPERATORS_FORWARD(sorted))), value, cmp)
+			upper_bound(subrange(it, containers::end(OPERATORS_FORWARD(sorted))), value, cmp)
 		);
 	}
 	static constexpr auto operator()(range auto && sorted, auto const & value) {

source/containers/algorithms/chunk_by.cpp

@@ -17,8 +17,8 @@ export import containers.common_iterator_functions;
 import containers.forward_range;
 import containers.iter_difference_t;
 import containers.iter_reference_t;
-import containers.range_view;
 import containers.stored_function;
+import containers.subrange;
 
 import bounded;
 import numeric_traits;
@@ -39,7 +39,7 @@ struct chunk_by_iterator {
 	}
 
 	constexpr auto operator*() const {
-		return range_view(m_first, m_middle);
+		return subrange(m_first, m_middle);
 	}
 	friend constexpr auto operator+(chunk_by_iterator lhs, bounded::constant_t<1>) {
 		lhs.m_first = lhs.m_middle;
@@ -70,7 +70,7 @@ struct chunk_by_iterator {
 
 	constexpr auto find_from_first() -> Iterator {
 		auto it = containers::find_if(
-			containers::adjacent(containers::range_view(m_first, m_last), 2_bi),
+			containers::adjacent(containers::subrange(m_first, m_last), 2_bi),
 			[&](auto tuple) {
 				return !m_predicate.get()(std::move(tuple)[0_bi], std::move(tuple)[1_bi]);
 			}

source/containers/algorithms/concatenate.cpp

@@ -20,9 +20,9 @@ import containers.iterator_t;
 import containers.iter_difference_t;
 import containers.range_size_t;
 import containers.range_value_t;
-import containers.range_view;
 import containers.resizable_container;
 import containers.size;
+import containers.subrange;
 
 import bounded;
 import numeric_traits;
@@ -104,7 +104,7 @@ constexpr auto move_existing_data_to_final_position(Container & container, auto
 		auto const new_size = original_size + before_size;
 		container.resize(static_cast<range_size_t<Container>>(new_size));
 		::containers::copy_backward(
-			containers::range_view(containers::begin(container), original_size),
+			containers::subrange(containers::begin(container), original_size),
 			containers::begin(container) + static_cast<difference_type>(new_size)
 		);
 	}

source/containers/algorithms/concatenate_view.cpp

@@ -22,9 +22,9 @@ import containers.is_empty;
 import containers.iter_difference_t;
 import containers.iterator_t;
 import containers.range_reference_t;
-import containers.range_view;
 import containers.size;
 import containers.sized_range;
+import containers.subrange;
 import containers.subtractable;
 
 import bounded;
@@ -144,14 +144,14 @@ struct concatenate_view_iterator {
 						return range;
 					}
 					remaining_offset = 0_bi;
-					return range_view(
+					return subrange(
 						containers::begin(std::move(range)) + 1_bi,
 						containers::end(std::move(range))
 					);
 				} else {
 					auto const added_size = bounded::min(containers::size(range), remaining_offset);
 					remaining_offset -= added_size;
-					return range_view(
+					return subrange(
 						containers::begin(std::move(range)) + added_size,
 						containers::end(std::move(range))
 					);
@@ -226,11 +226,11 @@ struct concatenate_view_iterator {
 	static constexpr auto max_index = bounded::constant<sizeof...(RangeViews)> - 1_bi;
 
 	constexpr auto operator_star(auto const index) const -> reference {
-		auto const & range_view = m_range_views[index];
+		auto const & subrange = m_range_views[index];
 		if constexpr (index == max_index) {
-			return containers::front(range_view);
-		} else if (!containers::is_empty(range_view)) {
-			return containers::front(range_view);
+			return containers::front(subrange);
+		} else if (!containers::is_empty(subrange)) {
+			return containers::front(subrange);
 		} else {
 			return operator_star(index + 1_bi);
 		}
@@ -274,7 +274,7 @@ struct concatenate_view {
 	static constexpr auto begin_impl(auto && ranges) {
 		return concatenate_view_iterator(tv::transform(
 			[](auto && range){
-				return range_view(
+				return subrange(
 					containers::begin(OPERATORS_FORWARD(range)),
 					containers::end(OPERATORS_FORWARD(range))
 				);

source/containers/algorithms/copy.cpp

@@ -16,7 +16,7 @@ import containers.begin_end;
 import containers.dereference;
 import containers.iterator;
 import containers.range;
-import containers.range_view;
+import containers.subrange;
 
 import bounded;
 import std_module;
@@ -113,7 +113,7 @@ using namespace bounded::literal;
 static_assert([] {
 	auto container = containers::array{1, 2, 3, 4};
 	containers::copy(
-		containers::range_view(containers::begin(container), containers::begin(container)),
+		containers::subrange(containers::begin(container), containers::begin(container)),
 		containers::begin(container) + 2_bi
 	);
 	return container == containers::array{1, 2, 3, 4};
@@ -122,7 +122,7 @@ static_assert([] {
 static_assert([] {
 	auto container = containers::array{1, 2, 3, 4};
 	containers::copy(
-		containers::range_view(containers::begin(container), containers::begin(container) + 2_bi),
+		containers::subrange(containers::begin(container), containers::begin(container) + 2_bi),
 		containers::begin(container) + 2_bi
 	);
 	return container == containers::array{1, 2, 1, 2};
@@ -131,7 +131,7 @@ static_assert([] {
 static_assert([] {
 	auto container = containers::array{1, 2, 3, 4};
 	containers::copy_backward(
-		containers::range_view(containers::begin(container), containers::begin(container) + 2_bi),
+		containers::subrange(containers::begin(container), containers::begin(container) + 2_bi),
 		containers::end(container)
 	);
 	return container == containers::array{1, 2, 1, 2};
@@ -140,7 +140,7 @@ static_assert([] {
 static_assert([] {
 	auto container = containers::array{1, 2, 3};
 	containers::copy_backward(
-		containers::range_view(containers::begin(container), containers::begin(container) + 2_bi),
+		containers::subrange(containers::begin(container), containers::begin(container) + 2_bi),
 		containers::end(container)
 	);
 	return container == containers::array{1, 1, 2};

source/containers/algorithms/erase.cpp

@@ -20,9 +20,9 @@ import containers.count_type;
 import containers.erase_concepts;
 import containers.iterator_t;
 import containers.mutable_iterator;
-import containers.range_view;
 import containers.size;
 import containers.splicable;
+import containers.subrange;
 
 import bounded;
 import bounded.test_int;
@@ -58,9 +58,9 @@ constexpr auto erase(Container & container, iterator_t<Container const &> const
 			++source;
 		}
 		if (source != last) {
-			containers::uninitialized_relocate(range_view(source, last), middle);
+			containers::uninitialized_relocate(subrange(source, last), middle);
 		} else {
-			containers::destroy_range(range_view(target, middle));
+			containers::destroy_range(subrange(target, middle));
 		}
 		container.set_size(containers::size(container) - count);
 		return containers::begin(container) + offset;
@@ -79,7 +79,7 @@ constexpr void erase_to_end(Container & container, iterator_t<Container const &>
 	if constexpr (can_set_size<Container>) {
 		auto const count = last - const_position;
 		auto target = ::containers::mutable_iterator(container, const_position);
-		containers::destroy_range(range_view(target, count));
+		containers::destroy_range(subrange(target, count));
 		container.set_size(containers::size(container) - count);
 	} else {
 		::containers::erase(container, const_position, last);

source/containers/algorithms/sort/chunked_insertion_sort.cpp

@@ -17,8 +17,8 @@ import containers.algorithms.sort.sort_exactly_6;
 import containers.begin_end;
 import containers.offset_type;
 import containers.range;
-import containers.range_view;
 import containers.size;
+import containers.subrange;
 import containers.uninitialized_array;
 
 import bounded;
@@ -68,7 +68,7 @@ constexpr auto chunked_insertion_sort(range auto && r, Compare const compare = C
 	#if 1
 	auto const initial_sort_size = bounded::min(chunk_size, ::containers::size(r));
 	::containers::small_size_optimized_sort(
-		range_view(it, initial_sort_size),
+		subrange(it, initial_sort_size),
 		compare,
 		[](auto &&, auto) { std::unreachable(); }
 	);
@@ -79,8 +79,8 @@ constexpr auto chunked_insertion_sort(range auto && r, Compare const compare = C
 		auto const count = bounded::min(chunk_size, last - it);
 		auto next_it = ::containers::runtime_sort_exactly_n_relocate(it, count, buffer.data(), compare);
 		merge_relocate_second_range(
-			range_view(containers::begin(r), it),
-			range_view(buffer.data(), count),
+			subrange(containers::begin(r), it),
+			subrange(buffer.data(), count),
 			next_it,
 			compare
 		);

source/containers/algorithms/sort/common_prefix.cpp

@@ -15,7 +15,7 @@ import containers.c_array;
 import containers.front;
 import containers.is_empty;
 import containers.iter_difference_t;
-import containers.range_view;
+import containers.subrange;
 
 import bounded;
 import std_module;
@@ -63,7 +63,7 @@ using namespace bounded::literal;
 template<typename T, std::size_t size>
 constexpr auto test_common_prefix(containers::c_array<T, size> const & source, auto const start_index, std::size_t const expected) {
 	auto const prefix = ::containers::common_prefix(
-		containers::range_view(source),
+		containers::subrange(source),
 		containers::to_radix_sort_key,
 		containers::to_radix_sort_key,
 		start_index

source/containers/algorithms/sort/double_buffered_ska_sort.cpp

@@ -26,8 +26,8 @@ import containers.integer_range;
 import containers.range;
 import containers.range_size_t;
 import containers.range_value_t;
-import containers.range_view;
 import containers.size;
+import containers.subrange;
 
 import bounded;
 import numeric_traits;
@@ -210,7 +210,7 @@ struct double_buffered_ska_sort_t {
 		if constexpr (numeric_traits::max_value<range_size_t<decltype(source)>> <= 1_bi) {
 			return false;
 		} else {
-			// TODO: Allow buffer to be larger, return range_view instead of bool
+			// TODO: Allow buffer to be larger, return subrange instead of bool
 			// TODO: The actual algorithm doesn't require a sized range
 			BOUNDED_ASSERT(containers::size(source) == containers::size(buffer));
 			// This delegates to an implementation function to collapse lvalue and