fixed ICE in VS2019 when using /std:c++17 instead of /std:c++latest

marzer · Mar 10, 2020 · 3ac8c2c · 3ac8c2c
1 parent f0e9171
commit 3ac8c2c
Show file tree

Hide file tree

Showing 5 changed files with 224 additions and 138 deletions.
diff --git a/include/toml++/toml_parser_impl.h b/include/toml++/toml_parser_impl.h
@@ -77,6 +77,73 @@ TOML_IMPL_START
 				return { prev_pos.line, static_cast<source_index>(prev_pos.column + fallback_offset) };
 			}
 
+			template <typename T, size_t N>
+			static void abort_with_error_concatenate(T&& arg, char(& buf)[N], char*& ptr) noexcept
+			{
+				(void)buf;
+
+				using arg_t = remove_cvref_t<T>;
+				if constexpr (std::is_same_v<arg_t, std::string_view> || std::is_same_v<arg_t, std::string>)
+				{
+					std::memcpy(ptr, arg.data(), arg.length());
+					ptr += arg.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, utf8_codepoint>)
+				{
+					toml::string_view cp_view;
+					if (arg.value <= U'\x1F') TOML_UNLIKELY
+						cp_view = low_character_escape_table[arg.value];
+					else if (arg.value == U'\x7F')  TOML_UNLIKELY
+						cp_view = TOML_STRING_PREFIX("\\u007F"sv);
+					else
+						cp_view = arg.template as_view<string_char>();
+
+					std::memcpy(ptr, cp_view.data(), cp_view.length());
+					ptr += cp_view.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, char>)
+				{
+					*ptr++ = arg;
+				}
+				else if constexpr (std::is_same_v<arg_t, bool>)
+				{
+					const auto boolval = arg ? "true"sv : "false"sv;
+					std::memcpy(ptr, boolval.data(), boolval.length());
+					ptr += boolval.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, node_type>)
+				{
+					const auto str = impl::node_type_friendly_names[
+						static_cast<std::underlying_type_t<node_type>>(arg)
+					];
+					std::memcpy(ptr, str.data(), str.length());
+					ptr += str.length();
+				}
+				else if constexpr (std::is_floating_point_v<arg_t>)
+				{
+					#if TOML_USE_STREAMS_FOR_FLOATS
+					{
+						std::ostringstream ss;
+						ss.precision(std::numeric_limits<arg_t>::digits10 + 1);
+						ss << arg;
+						const auto str = std::move(ss).str();
+						std::memcpy(ptr, str.c_str(), str.length());
+						ptr += str.length();
+					}
+					#else
+					{
+						const auto result = std::to_chars(ptr, buf + N, arg);
+						ptr = result.ptr;
+					}
+					#endif
+				}
+				else if constexpr (std::is_integral_v<arg_t>)
+				{
+					const auto result = std::to_chars(ptr, buf + N, arg);
+					ptr = result.ptr;
+				}
+			}
+
 			template <typename... T>
 			TOML_NORETURN
 			void abort_with_error(T &&... args) const TOML_MAY_THROW
@@ -90,70 +157,7 @@ TOML_IMPL_START
 					static constexpr auto buf_size = 512_sz;
 					TOML_GCC_ATTR(uninitialized) char buf[buf_size];
 					auto ptr = buf;
-					const auto concatenator = [&](auto&& arg) noexcept //a.k.a. "no stringstreams, thanks"
-					{
-						using arg_t = remove_cvref_t<decltype(arg)>;
-						if constexpr (std::is_same_v<arg_t, std::string_view> || std::is_same_v<arg_t, std::string>)
-						{
-							std::memcpy(ptr, arg.data(), arg.length());
-							ptr += arg.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, utf8_codepoint>)
-						{
-							toml::string_view cp_view;
-							if (arg.value <= U'\x1F') TOML_UNLIKELY
-								cp_view = low_character_escape_table[arg.value];
-							else if (arg.value == U'\x7F')  TOML_UNLIKELY
-								cp_view = TOML_STRING_PREFIX("\\u007F"sv);
-							else
-								cp_view = arg.template as_view<string_char>();
-
-							std::memcpy(ptr, cp_view.data(), cp_view.length());
-							ptr += cp_view.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, char>)
-						{
-							*ptr++ = arg;
-						}
-						else if constexpr (std::is_same_v<arg_t, bool>)
-						{
-							const auto boolval = arg ? "true"sv : "false"sv;
-							std::memcpy(ptr, boolval.data(), boolval.length());
-							ptr += boolval.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, node_type>)
-						{
-							const auto str = impl::node_type_friendly_names[
-								static_cast<std::underlying_type_t<node_type>>(arg)
-							];
-							std::memcpy(ptr, str.data(), str.length());
-							ptr += str.length();
-						}
-						else if constexpr (std::is_floating_point_v<arg_t>)
-						{
-							#if TOML_USE_STREAMS_FOR_FLOATS
-							{
-								std::ostringstream ss;
-								ss.precision(std::numeric_limits<arg_t>::digits10 + 1);
-								ss << arg;
-								const auto str = std::move(ss).str();
-								std::memcpy(ptr, str.c_str(), str.length());
-								ptr += str.length();
-							}
-							#else
-							{
-								const auto result = std::to_chars(ptr, buf + buf_size, arg);
-								ptr = result.ptr;
-							}
-							#endif
-						}
-						else if constexpr (std::is_integral_v<arg_t>)
-						{
-							const auto result = std::to_chars(ptr, buf + buf_size, arg);
-							ptr = result.ptr;
-						}
-					};
-					(concatenator(std::forward<T>(args)), ...);
+					(abort_with_error_concatenate(std::forward<T>(args), buf, ptr), ...);
 					*ptr = '\0';
 					#if TOML_EXCEPTIONS
 						TOML_ERROR(buf, current_position(1), reader.source_path());
@@ -1014,7 +1018,7 @@ TOML_IMPL_START
 						default: //??
 							abort_with_error(
 								"Error parsing "sv, node_type::floating_point,
-								"; an unspecified error occurred while trying to interpret '",
+								"; an unspecified error occurred while trying to interpret '"sv,
 								std::string_view{ chars, length }, "' as a value"sv
 							);
 					}
@@ -1211,7 +1215,7 @@ TOML_IMPL_START
 						default: //??
 							abort_with_error(
 								"Error parsing hexadecimal "sv, node_type::floating_point,
-								"; an unspecified error occurred while trying to interpret '",
+								"; an unspecified error occurred while trying to interpret '"sv,
 								std::string_view{ chars, length }, "' as a value"sv
 							);
 					}
@@ -1402,7 +1406,7 @@ TOML_IMPL_START
 					default: //??
 						abort_with_error(
 							"Error parsing "sv, traits::qualifier, ' ', node_type::integer,
-							"; an unspecified error occurred while trying to interpret '",
+							"; an unspecified error occurred while trying to interpret '"sv,
 							std::string_view{ chars, length }, "' as a value"sv
 						);
 				}

diff --git a/include/toml++/toml_version.h b/include/toml++/toml_version.h
@@ -2,7 +2,7 @@
 
 #define TOML_LIB_MAJOR		0
 #define TOML_LIB_MINOR		4
-#define TOML_LIB_PATCH		2
+#define TOML_LIB_PATCH		3
 
 #define TOML_LANG_MAJOR		0
 #define TOML_LANG_MINOR		5

diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
 	'tomlplusplus',
 	'cpp',
-	version : '0.4.2',
+	version : '0.4.3',
 	license : 'MIT',
 	default_options : [
 		'cpp_std=c++17',

diff --git a/toml.hpp b/toml.hpp
@@ -1,6 +1,6 @@
 //----------------------------------------------------------------------------------------------------------------------
 //
-// toml++ v0.4.2
+// toml++ v0.4.3
 // https://github.com/marzer/tomlplusplus
 // SPDX-License-Identifier: MIT
 //
@@ -312,7 +312,7 @@
 
 #define TOML_LIB_MAJOR		0
 #define TOML_LIB_MINOR		4
-#define TOML_LIB_PATCH		2
+#define TOML_LIB_PATCH		3
 
 #define TOML_LANG_MAJOR		0
 #define TOML_LANG_MINOR		5
@@ -6299,6 +6299,73 @@ TOML_IMPL_START
 				return { prev_pos.line, static_cast<source_index>(prev_pos.column + fallback_offset) };
 			}
 
+			template <typename T, size_t N>
+			static void abort_with_error_concatenate(T&& arg, char(& buf)[N], char*& ptr) noexcept
+			{
+				(void)buf;
+
+				using arg_t = remove_cvref_t<T>;
+				if constexpr (std::is_same_v<arg_t, std::string_view> || std::is_same_v<arg_t, std::string>)
+				{
+					std::memcpy(ptr, arg.data(), arg.length());
+					ptr += arg.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, utf8_codepoint>)
+				{
+					toml::string_view cp_view;
+					if (arg.value <= U'\x1F') TOML_UNLIKELY
+						cp_view = low_character_escape_table[arg.value];
+					else if (arg.value == U'\x7F')  TOML_UNLIKELY
+						cp_view = TOML_STRING_PREFIX("\\u007F"sv);
+					else
+						cp_view = arg.template as_view<string_char>();
+
+					std::memcpy(ptr, cp_view.data(), cp_view.length());
+					ptr += cp_view.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, char>)
+				{
+					*ptr++ = arg;
+				}
+				else if constexpr (std::is_same_v<arg_t, bool>)
+				{
+					const auto boolval = arg ? "true"sv : "false"sv;
+					std::memcpy(ptr, boolval.data(), boolval.length());
+					ptr += boolval.length();
+				}
+				else if constexpr (std::is_same_v<arg_t, node_type>)
+				{
+					const auto str = impl::node_type_friendly_names[
+						static_cast<std::underlying_type_t<node_type>>(arg)
+					];
+					std::memcpy(ptr, str.data(), str.length());
+					ptr += str.length();
+				}
+				else if constexpr (std::is_floating_point_v<arg_t>)
+				{
+					#if TOML_USE_STREAMS_FOR_FLOATS
+					{
+						std::ostringstream ss;
+						ss.precision(std::numeric_limits<arg_t>::digits10 + 1);
+						ss << arg;
+						const auto str = std::move(ss).str();
+						std::memcpy(ptr, str.c_str(), str.length());
+						ptr += str.length();
+					}
+					#else
+					{
+						const auto result = std::to_chars(ptr, buf + N, arg);
+						ptr = result.ptr;
+					}
+					#endif
+				}
+				else if constexpr (std::is_integral_v<arg_t>)
+				{
+					const auto result = std::to_chars(ptr, buf + N, arg);
+					ptr = result.ptr;
+				}
+			}
+
 			template <typename... T>
 			TOML_NORETURN
 			void abort_with_error(T &&... args) const TOML_MAY_THROW
@@ -6312,70 +6379,7 @@ TOML_IMPL_START
 					static constexpr auto buf_size = 512_sz;
 					TOML_GCC_ATTR(uninitialized) char buf[buf_size];
 					auto ptr = buf;
-					const auto concatenator = [&](auto&& arg) noexcept //a.k.a. "no stringstreams, thanks"
-					{
-						using arg_t = remove_cvref_t<decltype(arg)>;
-						if constexpr (std::is_same_v<arg_t, std::string_view> || std::is_same_v<arg_t, std::string>)
-						{
-							std::memcpy(ptr, arg.data(), arg.length());
-							ptr += arg.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, utf8_codepoint>)
-						{
-							toml::string_view cp_view;
-							if (arg.value <= U'\x1F') TOML_UNLIKELY
-								cp_view = low_character_escape_table[arg.value];
-							else if (arg.value == U'\x7F')  TOML_UNLIKELY
-								cp_view = TOML_STRING_PREFIX("\\u007F"sv);
-							else
-								cp_view = arg.template as_view<string_char>();
-
-							std::memcpy(ptr, cp_view.data(), cp_view.length());
-							ptr += cp_view.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, char>)
-						{
-							*ptr++ = arg;
-						}
-						else if constexpr (std::is_same_v<arg_t, bool>)
-						{
-							const auto boolval = arg ? "true"sv : "false"sv;
-							std::memcpy(ptr, boolval.data(), boolval.length());
-							ptr += boolval.length();
-						}
-						else if constexpr (std::is_same_v<arg_t, node_type>)
-						{
-							const auto str = impl::node_type_friendly_names[
-								static_cast<std::underlying_type_t<node_type>>(arg)
-							];
-							std::memcpy(ptr, str.data(), str.length());
-							ptr += str.length();
-						}
-						else if constexpr (std::is_floating_point_v<arg_t>)
-						{
-							#if TOML_USE_STREAMS_FOR_FLOATS
-							{
-								std::ostringstream ss;
-								ss.precision(std::numeric_limits<arg_t>::digits10 + 1);
-								ss << arg;
-								const auto str = std::move(ss).str();
-								std::memcpy(ptr, str.c_str(), str.length());
-								ptr += str.length();
-							}
-							#else
-							{
-								const auto result = std::to_chars(ptr, buf + buf_size, arg);
-								ptr = result.ptr;
-							}
-							#endif
-						}
-						else if constexpr (std::is_integral_v<arg_t>)
-						{
-							const auto result = std::to_chars(ptr, buf + buf_size, arg);
-							ptr = result.ptr;
-						}
-					};
-					(concatenator(std::forward<T>(args)), ...);
+					(abort_with_error_concatenate(std::forward<T>(args), buf, ptr), ...);
 					*ptr = '\0';
 					#if TOML_EXCEPTIONS
 						TOML_ERROR(buf, current_position(1), reader.source_path());
@@ -7236,7 +7240,7 @@ TOML_IMPL_START
 						default: //??
 							abort_with_error(
 								"Error parsing "sv, node_type::floating_point,
-								"; an unspecified error occurred while trying to interpret '",
+								"; an unspecified error occurred while trying to interpret '"sv,
 								std::string_view{ chars, length }, "' as a value"sv
 							);
 					}
@@ -7433,7 +7437,7 @@ TOML_IMPL_START
 						default: //??
 							abort_with_error(
 								"Error parsing hexadecimal "sv, node_type::floating_point,
-								"; an unspecified error occurred while trying to interpret '",
+								"; an unspecified error occurred while trying to interpret '"sv,
 								std::string_view{ chars, length }, "' as a value"sv
 							);
 					}
@@ -7624,7 +7628,7 @@ TOML_IMPL_START
 					default: //??
 						abort_with_error(
 							"Error parsing "sv, traits::qualifier, ' ', node_type::integer,
-							"; an unspecified error occurred while trying to interpret '",
+							"; an unspecified error occurred while trying to interpret '"sv,
 							std::string_view{ chars, length }, "' as a value"sv
 						);
 				}