Fixed exception messages being lost in memory 😒

powerof3 · Apr 12, 2024 · ed857b8 · ed857b8
1 parent 950fbcb
commit ed857b8
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 40 deletions.
diff --git a/SPID/include/LinkedDistribution.h b/SPID/include/LinkedDistribution.h
@@ -5,7 +5,6 @@
 
 namespace LinkedDistribution
 {
-
 	/// <summary>
 	/// Scope of a linked form determines which distributions can trigger linked forms.
 	/// </summary>

diff --git a/SPID/include/LookupConfigs.h b/SPID/include/LookupConfigs.h
@@ -91,59 +91,43 @@ namespace Distribution::INI
 			const std::string key;
 
 			UnsupportedFormTypeException(const std::string& key) :
+				std::exception(fmt::format("Unsupported form type {}"sv, key).c_str()),
 				key(key)
 			{}
-
-			const char* what() const noexcept override
-			{
-				return fmt::format("Unsupported Form type {}"sv, key).c_str();
-			}
 		};
 
 		struct InvalidIndexOrCountException : std::exception
 		{
 			const std::string entry;
 
 			InvalidIndexOrCountException(const std::string& entry) :
+				std::exception(fmt::format("Invalid index or count {}"sv, entry).c_str()),
 				entry(entry)
 			{}
-
-			const char* what() const noexcept override
-			{
-				return fmt::format("Invalid index or count {}"sv, entry).c_str();
-			}
 		};
 
 		struct InvalidChanceException : std::exception
 		{
 			const std::string entry;
 
 			InvalidChanceException(const std::string& entry) :
+				std::exception(fmt::format("Invalid chance {}"sv, entry).c_str()),
 				entry(entry)
 			{}
-
-			const char* what() const noexcept override
-			{
-				return fmt::format("Invalid chance {}"sv, entry).c_str();
-			}
 		};
 
 		struct MissingDistributableFormException : std::exception
 		{
-			const char* what() const noexcept override
-			{
-				return "Missing distributable form";
-			}
+			MissingDistributableFormException() :
+				std::exception("Missing distributable form")
+			{}
 		};
 
 		struct MissingComponentParserException : std::exception
 		{
-			std::string component;
-
-			const char* what() const noexcept override
-			{
-				return "Missing component parser";
-			}
+			MissingComponentParserException() :
+				std::exception("Missing component parser") 
+			{}
 		};
 	}
 

diff --git a/SPID/include/Parser.h b/SPID/include/Parser.h
@@ -28,14 +28,10 @@ struct NotEnoughComponentsException: std::exception
 	const size_t entrySectionsCount;
 
 	NotEnoughComponentsException(size_t componentParsersCount, size_t entrySectionsCount) :
+		std::exception(fmt::format("Too many sections. Expected at most {}, but got {}"sv, componentParsersCount, entrySectionsCount).c_str()) ,
 		componentParsersCount(componentParsersCount),
 		entrySectionsCount(entrySectionsCount)
 	{}
-
-	const char* what() const noexcept override
-	{
-		return fmt::format("Too many sections. Expected at most {}, but got {}"sv, componentParsersCount, entrySectionsCount).c_str();
-	}
 };
 
 /// <summary>
@@ -56,9 +52,15 @@ struct NotEnoughComponentsException: std::exception
 template <typename Data, key_component_parser<Data> KeyComponentParser, component_parser<Data>... ComponentParsers>
 std::optional<Data> Parse(const std::string& key, const std::string& entry)
 {
+	Data data{};
+
+	if (!KeyComponentParser()(key, data)) {
+		return std::nullopt;
+	}
+
 	constexpr const size_t numberOfComponents = sizeof...(ComponentParsers);
 
-	const auto rawSections = string::split(entry, "|");
+	const auto   rawSections = string::split(entry, "|");
 	const size_t numberOfSections = rawSections.size();
 
 	if (numberOfSections > numberOfComponents) {
@@ -75,12 +77,6 @@ std::optional<Data> Parse(const std::string& key, const std::string& entry)
 		sections[i] = "";
 	}
 
-	Data data{};
-
-	if (!KeyComponentParser()(key, data)) {
-		return std::nullopt;
-	}
-
 	detail::parse_each<Data, ComponentParsers...>(data, sections, std::index_sequence_for<ComponentParsers...>());
 
 	return data;

diff --git a/SPID/src/LinkedDistribution.cpp b/SPID/src/LinkedDistribution.cpp
@@ -87,9 +87,11 @@ namespace LinkedDistribution
 					return true;
 				}
 			} catch (const Exception::MissingComponentParserException& e) {
-				logger::warn("SKIPPED: Linked Form must have a form and at least one Parent Form: {} = {}"sv, key, value);
+				logger::warn("'{} = {}'"sv, key, value);
+				logger::warn("\t\tSKIPPED: Linked Form must have a form and at least one Parent Form"sv);
 			} catch (const std::exception& e) {
-				logger::warn("SKIPPED {}", e.what());
+				logger::warn("'{} = {}'"sv, key, value);
+				logger::warn("\t\tSKIPPED: {}"sv, e.what());
 			}
 			return false;
 		}