🛠 Properly clean up everything to use static_ vs. fixed_ to sync up n…

…aming conventions
soasis · Jun 22, 2022 · 787d1d3 · 787d1d3
1 parent 5350354
commit 787d1d3
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 23 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -129,11 +129,11 @@ FetchContent_Declare(ztd.idk
 	GIT_TAG main)
 FetchContent_MakeAvailable(ztd.idk)
 
-# ztd.fixed_container
-FetchContent_Declare(ztd.fixed_container
-	GIT_REPOSITORY https://github.com/soasis/fixed_container.git
+# ztd.static_containers
+FetchContent_Declare(ztd.static_containers
+	GIT_REPOSITORY https://github.com/soasis/static_containers.git
 	GIT_TAG main)
-FetchContent_MakeAvailable(ztd.fixed_container)
+FetchContent_MakeAvailable(ztd.static_containers)
 
 # ztd.cuneicode
 if(ZTD_TEXT_USE_CUNEICODE)
@@ -223,7 +223,7 @@ target_link_libraries(ztd.text
 	INTERFACE
 	${ztd-text-libiconv-dl}
 	ztd::idk
-	ztd::fixed_container
+	ztd::static_containers
 	${ztd-text-libiconv}
 	${ztd-text-cuneicode})
 install(DIRECTORY include/

diff --git a/include/ztd/text/decode_one.hpp b/include/ztd/text/decode_one.hpp
@@ -49,7 +49,7 @@
 #include <ztd/text/detail/transcode_routines.hpp>
 #include <ztd/text/detail/forward_if_move_only.hpp>
 
-#include <ztd/fixed_container.hpp>
+#include <ztd/static_containers.hpp>
 #include <ztd/ranges/unbounded.hpp>
 #include <ztd/idk/span.hpp>
 #include <ztd/ranges/detail/insert_bulk.hpp>
@@ -294,13 +294,13 @@ namespace ztd { namespace text {
 			= (is_char_traitable_v<_OutputCodePoint> || is_unicode_code_point_v<_OutputCodePoint>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
 			// prevent instantiation errors with basic_string by boxing it inside of an "if constexpr"
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodePoint, max_code_points_v<_UEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodePoint, max_code_points_v<_UEncoding>>;
 			return __txt_detail::__decode_one_dispatch<false, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodePoint, max_code_points_v<_UEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodePoint, max_code_points_v<_UEncoding>>, _OutputContainer>;
 			return __txt_detail::__decode_one_dispatch<false, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
@@ -418,13 +418,13 @@ namespace ztd { namespace text {
 		constexpr bool _IsStringable
 			= (is_char_traitable_v<_OutputCodePoint> || is_unicode_code_point_v<_OutputCodePoint>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodePoint, max_code_points_v<_UEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodePoint, max_code_points_v<_UEncoding>>;
 			return __txt_detail::__decode_one_dispatch<true, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodePoint, max_code_points_v<_UEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodePoint, max_code_points_v<_UEncoding>>, _OutputContainer>;
 			return __txt_detail::__decode_one_dispatch<true, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}

diff --git a/include/ztd/text/encode_one.hpp b/include/ztd/text/encode_one.hpp
@@ -50,7 +50,7 @@
 
 #include <ztd/ranges/unbounded.hpp>
 #include <ztd/idk/span.hpp>
-#include <ztd/fixed_container.hpp>
+#include <ztd/static_containers.hpp>
 #include <ztd/ranges/detail/insert_bulk.hpp>
 
 #include <ztd/prologue.hpp>
@@ -295,13 +295,13 @@ namespace ztd { namespace text {
 		constexpr bool _IsStringable
 			= (is_char_traitable_v<_OutputCodeUnit> || is_unicode_code_point_v<_OutputCodeUnit>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodeUnit, max_code_units_v<_UEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodeUnit, max_code_units_v<_UEncoding>>;
 			return __txt_detail::__encode_one_dispatch<false, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodeUnit, max_code_units_v<_UEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodeUnit, max_code_units_v<_UEncoding>>, _OutputContainer>;
 			return __txt_detail::__encode_one_dispatch<false, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
@@ -421,13 +421,13 @@ namespace ztd { namespace text {
 		constexpr bool _IsStringable
 			= (is_char_traitable_v<_OutputCodeUnit> || is_unicode_code_point_v<_OutputCodeUnit>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodeUnit, max_code_units_v<_UEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodeUnit, max_code_units_v<_UEncoding>>;
 			return __txt_detail::__encode_one_dispatch<true, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodeUnit, max_code_units_v<_UEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodeUnit, max_code_units_v<_UEncoding>>, _OutputContainer>;
 			return __txt_detail::__encode_one_dispatch<true, _RealOutputContainer>(::std::forward<_Input>(__input),
 				::std::forward<_Encoding>(__encoding), ::std::forward<_ErrorHandler>(__error_handler), __state);
 		}

diff --git a/include/ztd/text/transcode_one.hpp b/include/ztd/text/transcode_one.hpp
@@ -53,7 +53,7 @@
 
 #include <ztd/ranges/unbounded.hpp>
 #include <ztd/idk/span.hpp>
-#include <ztd/fixed_container.hpp>
+#include <ztd/static_containers.hpp>
 #include <ztd/ranges/detail/insert_bulk.hpp>
 
 #include <ztd/prologue.hpp>
@@ -483,15 +483,15 @@ namespace ztd { namespace text {
 		constexpr bool _IsStringable
 			= (is_char_traitable_v<_OutputCodeUnit> || is_unicode_code_point_v<_OutputCodeUnit>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodeUnit, max_code_units_v<_UToEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodeUnit, max_code_units_v<_UToEncoding>>;
 			return __txt_detail::__transcode_one_dispatch<false, _RealOutputContainer>(
 				::std::forward<_Input>(__input), ::std::forward<_FromEncoding>(__from_encoding),
 				::std::forward<_ToEncoding>(__to_encoding), ::std::forward<_FromErrorHandler>(__from_error_handler),
 				::std::forward<_ToErrorHandler>(__to_error_handler), __from_state, __to_state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodeUnit, max_code_units_v<_UToEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodeUnit, max_code_units_v<_UToEncoding>>, _OutputContainer>;
 			return __txt_detail::__transcode_one_dispatch<false, _RealOutputContainer>(
 				::std::forward<_Input>(__input), ::std::forward<_FromEncoding>(__from_encoding),
 				::std::forward<_ToEncoding>(__to_encoding), ::std::forward<_FromErrorHandler>(__from_error_handler),
@@ -723,15 +723,15 @@ namespace ztd { namespace text {
 		constexpr bool _IsStringable
 			= (is_char_traitable_v<_OutputCodeUnit> || is_unicode_code_point_v<_OutputCodeUnit>);
 		if constexpr (_IsVoidContainer && _IsStringable) {
-			using _RealOutputContainer = ::ztd::fixed_basic_string<_OutputCodeUnit, max_code_units_v<_UToEncoding>>;
+			using _RealOutputContainer = ::ztd::static_basic_string<_OutputCodeUnit, max_code_units_v<_UToEncoding>>;
 			return __txt_detail::__transcode_one_dispatch<true, _RealOutputContainer>(
 				::std::forward<_Input>(__input), ::std::forward<_FromEncoding>(__from_encoding),
 				::std::forward<_ToEncoding>(__to_encoding), ::std::forward<_FromErrorHandler>(__from_error_handler),
 				::std::forward<_ToErrorHandler>(__to_error_handler), __from_state, __to_state);
 		}
 		else {
 			using _RealOutputContainer = ::std::conditional_t<_IsVoidContainer,
-				::ztd::fixed_vector<_OutputCodeUnit, max_code_units_v<_UToEncoding>>, _OutputContainer>;
+				::ztd::static_vector<_OutputCodeUnit, max_code_units_v<_UToEncoding>>, _OutputContainer>;
 			return __txt_detail::__transcode_one_dispatch<true, _RealOutputContainer>(
 				::std::forward<_Input>(__input), ::std::forward<_FromEncoding>(__from_encoding),
 				::std::forward<_ToEncoding>(__to_encoding), ::std::forward<_FromErrorHandler>(__from_error_handler),

diff --git a/tests/basic_run_time/source/decode_one.cpp b/tests/basic_run_time/source/decode_one.cpp
@@ -41,7 +41,7 @@ inline namespace ztd_text_tests_basic_run_time_decode_one {
 	void check_decode_one(Encoding& encoding, Source& source, Expected& expected) {
 		using OutChar                    = ztd::text::code_point_t<Encoding>;
 		constexpr std::size_t MaxOutSize = ztd::text::max_code_points_v<Encoding>;
-		using Output                     = ztd::fixed_basic_string<OutChar, MaxOutSize>;
+		using Output                     = ztd::static_basic_string<OutChar, MaxOutSize>;
 		auto source_it                   = source.cbegin();
 		auto source_last                 = source.cend();
 		auto expected_it                 = expected.cbegin();

diff --git a/tests/basic_run_time/source/encode_one.cpp b/tests/basic_run_time/source/encode_one.cpp
@@ -41,7 +41,7 @@ inline namespace ztd_text_tests_basic_run_time_encode_one {
 	void check_encode_one(Encoding& encoding, Source& source, Expected& expected) {
 		using OutChar                    = ztd::text::code_unit_t<Encoding>;
 		constexpr std::size_t MaxOutSize = ztd::text::max_code_units_v<Encoding>;
-		using Output                     = ztd::fixed_basic_string<OutChar, MaxOutSize>;
+		using Output                     = ztd::static_basic_string<OutChar, MaxOutSize>;
 		auto source_it                   = source.cbegin();
 		auto source_last                 = source.cend();
 		auto expected_it                 = expected.cbegin();

diff --git a/tests/basic_run_time/source/transcode_one.cpp b/tests/basic_run_time/source/transcode_one.cpp
@@ -42,7 +42,7 @@ inline namespace ztd_text_tests_basic_run_time_transcode_one {
 	     FromEncoding& from_encoding, ToEncoding& to_encoding, Source& source, Expected& expected) {
 		using OutChar                    = ztd::text::code_unit_t<ToEncoding>;
 		constexpr std::size_t MaxOutSize = ztd::text::max_code_units_v<ToEncoding>;
-		using Output                     = ztd::fixed_basic_string<OutChar, MaxOutSize>;
+		using Output                     = ztd::static_basic_string<OutChar, MaxOutSize>;
 		auto source_it                   = source.cbegin();
 		auto source_last                 = source.cend();
 		auto expected_it                 = expected.cbegin();