🛠 Repair erroneous GCC bounds check and update to windows_1252

soasis · Dec 23, 2022 · 828a382 · 828a382
1 parent fe03443
commit 828a382
Show file tree

Hide file tree

Showing 19 changed files with 24 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,6 +117,7 @@ if(ZTD_TEXT_IS_TOP_LEVEL_PROJECT)
 		#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95353
 		if (CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0)
 			check_compiler_diagnostic(stringop-overflow)
+			check_compiler_diagnostic(array-bounds)
 		endif()
 	endif()
 endif()

diff --git a/benchmarks/barrier/CMakeLists.txt b/benchmarks/barrier/CMakeLists.txt
@@ -59,6 +59,7 @@ target_compile_options(ztd.text.benchmarks.barrier
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_link_libraries(ztd.text.benchmarks.barrier
 	PRIVATE

diff --git a/benchmarks/conversion_speed/CMakeLists.txt b/benchmarks/conversion_speed/CMakeLists.txt
@@ -66,7 +66,8 @@ function (generate_converion_speed_benchmark_targets name data_name title)
 			${--warn-errors}
 			${--allow-alignas-extra-padding}
 			${--allow-stringop-overflow}
-	)
+			${--allow-array-bounds}
+			)
 	target_compile_definitions(ztd.text.benchmarks.conversion_speed.${name}
 		PRIVATE
 			u8_data=u8_${data_name}_data

diff --git a/benchmarks/function_form/CMakeLists.txt b/benchmarks/function_form/CMakeLists.txt
@@ -46,6 +46,7 @@ function (generate_function_form_benchmark_targets name data_name title)
 		${--warn-extra}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 		# MSVC is BROKEN
 		# ${--warn-errors}
 	)

diff --git a/examples/basic/CMakeLists.txt b/examples/basic/CMakeLists.txt
@@ -74,6 +74,7 @@ foreach (example_source_name ${ztd.text.examples.basic.sources})
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 		${--allow-bit-int-extension}
 	)
 

diff --git a/examples/boost.text/CMakeLists.txt b/examples/boost.text/CMakeLists.txt
@@ -45,6 +45,7 @@ target_compile_options(ztd.text.examples.boost_text
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 )
 
 target_include_directories(ztd.text.examples.boost_text

diff --git a/examples/documentation/compile_fails/CMakeLists.txt b/examples/documentation/compile_fails/CMakeLists.txt
@@ -47,6 +47,7 @@ foreach (example_name ${ztd.text.examples.documentation.compile_fails.sources})
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 	)
 	set_target_properties(${example_target}
 		PROPERTIES

diff --git a/examples/documentation/quick/basic/CMakeLists.txt b/examples/documentation/quick/basic/CMakeLists.txt
@@ -50,6 +50,7 @@ foreach (example_source_name ${ztd.text.examples.documentation.quick.basic.sourc
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 	)
 
 	target_link_libraries(${example_target}

diff --git a/examples/documentation/snippets/CMakeLists.txt b/examples/documentation/snippets/CMakeLists.txt
@@ -46,6 +46,7 @@ foreach (example_source_name ${ztd.text.examples.documentation.snippets.sources}
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 	)
 	target_include_directories(${example_target}
 		PRIVATE

diff --git a/examples/shift_jis/CMakeLists.txt b/examples/shift_jis/CMakeLists.txt
@@ -64,6 +64,7 @@ target_compile_options(ztd.text.examples.shift_jis
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.examples.shift_jis
 	PRIVATE

diff --git a/include/ztd/text/latin1.hpp → include/ztd/text/windows_1252.hpp b/include/ztd/text/latin1.hpp → include/ztd/text/windows_1252.hpp
diff --git a/tests/additional_encodings/CMakeLists.txt b/tests/additional_encodings/CMakeLists.txt
@@ -71,6 +71,7 @@ target_compile_options(ztd.text.tests.additional_encodings
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.tests.additional_encodings
 	PRIVATE 

diff --git a/tests/additional_encodings/source/latin1.cpp → ...itional_encodings/source/windows_1252.cpp b/tests/additional_encodings/source/latin1.cpp → ...itional_encodings/source/windows_1252.cpp
@@ -38,17 +38,17 @@
 #include <iostream>
 #include <vector>
 
-TEST_CASE("text/additional_encodings/latin1", "test a quick roundtrip using example Latin-1 text to UTF-32") {
-	constexpr const char* original_filename = "data/tests/additional_encodings/latin1/latin1.txt";
+TEST_CASE("text/additional_encodings/windows_1252", "test a quick roundtrip using example Latin-1 text to UTF-32") {
+	constexpr const char* original_filename = "data/tests/additional_encodings/windows_1252/windows_1252.txt";
 	std::ifstream original_ifstr(
 	     original_filename, static_cast<std::ios_base::openmode>(std::ios_base::in | std::ios_base::binary));
 	original_ifstr >> std::noskipws;
 	std::vector<unsigned char> original_data(
 	     std::istream_iterator<unsigned char>(original_ifstr), std::istream_iterator<unsigned char> {});
 
 	constexpr const char* expected_filename = ztd::endian::native == ztd::endian::little
-	     ? "data/tests/additional_encodings/latin1/utf-32-le.txt"
-	     : "data/tests/additional_encodings/latin1/utf-32-be.txt";
+	     ? "data/tests/additional_encodings/windows_1252/utf-32-le.txt"
+	     : "data/tests/additional_encodings/windows_1252/utf-32-be.txt";
 	std::ifstream expected_ifstr(
 	     expected_filename, static_cast<std::ios_base::openmode>(std::ios_base::in | std::ios_base::binary));
 	expected_ifstr >> std::noskipws;
@@ -59,13 +59,13 @@ TEST_CASE("text/additional_encodings/latin1", "test a quick roundtrip using exam
 	std::u32string_view expected(
 	     reinterpret_cast<const char32_t*>(expected_data.data()), expected_data.size() / sizeof(char32_t));
 
-	auto decoded_result           = ztd::text::decode_to(original, ztd::text::latin1, ztd::text::pass_handler);
+	auto decoded_result           = ztd::text::decode_to(original, ztd::text::windows_1252, ztd::text::pass_handler);
 	const std::u32string& decoded = decoded_result.output;
 	REQUIRE(decoded_result.error_code == ztd::text::encoding_error::ok);
 	REQUIRE_FALSE(decoded_result.errors_were_handled());
 	REQUIRE(ztd::ranges::empty(decoded_result.input));
 	REQUIRE(decoded == expected);
-	auto encoded_result        = ztd::text::encode_to(decoded, ztd::text::latin1, ztd::text::pass_handler);
+	auto encoded_result        = ztd::text::encode_to(decoded, ztd::text::windows_1252, ztd::text::pass_handler);
 	const std::string& encoded = encoded_result.output;
 	REQUIRE(encoded_result.error_code == ztd::text::encoding_error::ok);
 	REQUIRE_FALSE(encoded_result.errors_were_handled());

diff --git a/tests/basic_compile_time/CMakeLists.txt b/tests/basic_compile_time/CMakeLists.txt
@@ -53,6 +53,7 @@ target_compile_options(ztd.text.tests.basic_compile_time
 	${--extra-constexpr-steps}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.tests.basic_compile_time
 	PRIVATE 

diff --git a/tests/basic_run_time/CMakeLists.txt b/tests/basic_run_time/CMakeLists.txt
@@ -49,6 +49,7 @@ target_compile_options(ztd.text.tests.basic_run_time
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.tests.basic_run_time
 	PRIVATE 

diff --git a/tests/compile_fails/CMakeLists.txt b/tests/compile_fails/CMakeLists.txt
@@ -48,6 +48,7 @@ foreach (test_name ${ztd.text.tests.tests.compile_fails.sources})
 		${--warn-errors}
 		${--allow-alignas-extra-padding}
 		${--allow-stringop-overflow}
+		${--allow-array-bounds}
 	)
 	target_link_libraries(${test_target}
 		PRIVATE

diff --git a/tests/iconv/CMakeLists.txt b/tests/iconv/CMakeLists.txt
@@ -53,6 +53,7 @@ target_compile_options(ztd.text.tests.iconv
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.tests.iconv
 	PRIVATE 

diff --git a/tests/inclusion/CMakeLists.txt b/tests/inclusion/CMakeLists.txt
@@ -46,6 +46,7 @@ target_compile_options(ztd.text.tests.inclusion
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_link_libraries(ztd.text.tests.inclusion
 	PRIVATE

diff --git a/tests/tiny_buffer/CMakeLists.txt b/tests/tiny_buffer/CMakeLists.txt
@@ -52,6 +52,7 @@ target_compile_options(ztd.text.tests.tiny_buffer
 	${--warn-errors}
 	${--allow-alignas-extra-padding}
 	${--allow-stringop-overflow}
+	${--allow-array-bounds}
 )
 target_include_directories(ztd.text.tests.tiny_buffer
 	PRIVATE