Further work on better exceptions.

src/Battling/Models/Battle.cpp

@@ -137,9 +137,7 @@ void Battle::AddVolatileScript(const ArbUt::StringView& key) {
     }
     script = _library->LoadScript(ScriptCategory::Battle, key);
     if (script == nullptr) {
-        std::stringstream ss;
+        THROW_CREATURE("Invalid volatile script requested for battle: '" << key.c_str() << "'.");
-        ss << "Invalid volatile script requested for battle: '" << key.c_str() << "'.";
-        throw CreatureException(ss.str());
     }
     return _volatile.Add(script.GetRaw());
 }

src/Battling/Models/BattleSide.cpp

@@ -30,7 +30,7 @@ void BattleSide::SetChoice(BaseTurnChoice* choice) {
     AssertNotNull(choice)
     auto find = std::find(_creatures.begin(), _creatures.end(), choice->GetUser());
     if (find == _creatures.end())
-        throw CreatureException("User not found");
+        THROW_CREATURE("User not found");
     uint8_t index = std::distance(_creatures.begin(), find);
     _choices[index] = std::shared_ptr<BaseTurnChoice>(choice);
     _choicesSet++;

src/Battling/Models/BattleSide.hpp

@@ -59,7 +59,7 @@ namespace CreatureLib::Battling {
                 if (_creatures[i] == c)
                     return i;
             }
-            throw CreatureException("Unable to find creature on field.");
+            THROW_CREATURE("Unable to find creature on field.");
         }
 
         void MarkSlotAsUnfillable(const ArbUt::BorrowedPtr<Creature>& creature) noexcept {

src/Battling/Models/CreateCreature.cpp

@@ -22,7 +22,7 @@ CreateCreature CreateCreature::WithGender(Library::Gender gender) {
 
 CreateCreature CreateCreature::WithAttack(const ArbUt::StringView& attackName, AttackLearnMethod learnMethod) {
     if (_attacks.Count() >= _library->GetSettings()->GetMaximalMoves())
-        throw CreatureException("You have already set the maximum amount of allowed moves.");
+        THROW_CREATURE("You have already set the maximum amount of allowed moves.");
 
     auto attackData = _library->GetAttackLibrary()->Get(attackName.GetHash());
     _attacks.Append(std::tuple(attackData, learnMethod));
@@ -50,7 +50,7 @@ Creature* CreateCreature::Create() {
     ArbUt::BorrowedPtr<const Library::Item> heldItem;
     if (!this->_heldItem.Empty()) {
         if (!_library->GetItemLibrary()->TryGet(this->_heldItem.GetHash(), heldItem)) {
-            throw CreatureException("Invalid held item.");
+            THROW_CREATURE("Invalid held item '" << this->_heldItem.c_str() << "'.");
         }
     }
     auto experience = _library->GetGrowthRateLibrary()->CalculateExperience(species->GetGrowthRate(), _level);

src/Battling/Models/Creature.cpp

@@ -227,14 +227,14 @@ ArbUt::BorrowedPtr<const Library::SpeciesVariant> Battling::Creature::GetDisplay
 void Battling::Creature::SetHeldItem(const ArbUt::BasicStringView& itemName) {
     ArbUt::BorrowedPtr<const Library::Item> item;
     if (!_library->GetItemLibrary()->TryGet(itemName.GetHash(), item)) {
-        throw CreatureException("Item not found.");
+        THROW_CREATURE("Item not found '" << itemName.c_str() << "'.");
     }
     _heldItem = item;
 }
 void Battling::Creature::SetHeldItem(uint32_t itemNameHash) {
     ArbUt::BorrowedPtr<const Library::Item> item;
     if (!_library->GetItemLibrary()->TryGet(itemNameHash, item)) {
-        throw CreatureException("Item not found.");
+        THROW_CREATURE("Item not found.");
     }
     _heldItem = item;
 }
@@ -247,9 +247,7 @@ void Battling::Creature::AddVolatileScript(const ArbUt::StringView& name) {
     }
     script = this->_library->LoadScript(ScriptCategory::Creature, name);
     if (script == nullptr) {
-        std::stringstream ss;
+        THROW_CREATURE("Invalid volatile script requested for creature: '" << name.c_str() << "'.");
-        ss << "Invalid volatile script requested for creature: '" << name.c_str() << "'.";
-        throw CreatureException(ss.str());
     }
     _volatile.Add(script.GetRaw());
 }

src/Battling/Models/ExecutingAttack.hpp

@@ -66,7 +66,7 @@ namespace CreatureLib::Battling {
                     return _hits[i * _numberHits + hit];
                 }
             }
-            throw CreatureException("Invalid target requested.");
+            THROW_CREATURE("Invalid target requested.");
         }
 
         HitData* GetTargetIteratorBegin(Creature* creature) {
@@ -75,7 +75,7 @@ namespace CreatureLib::Battling {
                     return &_hits[i * _numberHits * sizeof(HitData)];
                 }
             }
-            throw CreatureException("Invalid target requested.");
+            THROW_CREATURE("Invalid target requested.");
         }
 
         bool IsCreatureTarget(Creature* creature) noexcept {

src/Library/CreatureData/SpeciesVariant.cpp

@@ -13,5 +13,5 @@ CreatureLib::Library::SpeciesVariant::GetTalentIndex(const ArbUt::StringView& ta
             return TalentIndex(true, i);
         }
     }
-    throw CreatureException("The given talent is not a valid talent for this creature.");
+    THROW_CREATURE("The given talent is not a valid talent for this creature.");
 }

src/Library/EffectParameter.hpp

@@ -25,9 +25,7 @@ namespace CreatureLib::Library {
         inline EffectParameterType GetType() const noexcept { return _type; }
         bool AsBool() const {
             if (_type != EffectParameterType::Bool) {
-                std::stringstream ss;
+                THROW_CREATURE("Cast effect parameter to bool, but was " << EffectParameterTypeHelper::ToString(_type));
-                ss << "Cast effect parameter to bool, but was " << EffectParameterTypeHelper::ToString(_type);
-                throw CreatureException(ss.str());
             }
             return std::get<bool>(_value);
         }
@@ -36,9 +34,7 @@ namespace CreatureLib::Library {
                 if (_type == EffectParameterType::Float) {
                     return static_cast<int64_t>(std::get<float>(_value));
                 }
-                std::stringstream ss;
+                THROW_CREATURE("Cast effect parameter to int, but was " << EffectParameterTypeHelper::ToString(_type));
-                ss << "Cast effect parameter to int, but was " << EffectParameterTypeHelper::ToString(_type);
-                throw CreatureException(ss.str());
             }
             return std::get<int64_t>(_value);
         }
@@ -47,17 +43,15 @@ namespace CreatureLib::Library {
                 if (_type == EffectParameterType::Int) {
                     return static_cast<float>(std::get<int64_t>(_value));
                 }
-                std::stringstream ss;
+                THROW_CREATURE("Cast effect parameter to float, but was "
-                ss << "Cast effect parameter to float, but was " << EffectParameterTypeHelper::ToString(_type);
+                               << EffectParameterTypeHelper::ToString(_type));
-                throw CreatureException(ss.str());
             }
             return std::get<float>(_value);
         }
         const ArbUt::StringView& AsString() const {
             if (_type != EffectParameterType::String) {
-                std::stringstream ss;
+                THROW_CREATURE("Cast effect parameter to string, but was "
-                ss << "Cast effect parameter to string, but was " << EffectParameterTypeHelper::ToString(_type);
+                               << EffectParameterTypeHelper::ToString(_type));
-                throw CreatureException(ss.str());
             }
             return std::get<ArbUt::StringView>(_value);
         }

src/Library/Exceptions/CreatureException.hpp

@@ -1,6 +1,7 @@
 #ifndef CREATURELIB_CREATUREEXCEPTION_HPP
 #define CREATURELIB_CREATUREEXCEPTION_HPP
 
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
@@ -12,7 +13,9 @@ public:
 };
 
 #define THROW_CREATURE(message)                                                                                        \
-    std::stringstream ss;                                                                                              \
+    {                                                                                                                  \
-    ss << "[" << __FILENAME__ << ", " << __LINE__ << "] " << message;                                                  \
+        std::stringstream ss;                                                                                          \
-    throw CreatureException(ss.str());
+        ss << "[" << __FILENAME__ << ":" << __LINE__ << "] " << message;                                               \
+        throw CreatureException(ss.str());                                                                             \
+    }
 #endif // CREATURELIB_CREATUREEXCEPTION_HPP

src/Library/GrowthRates/GrowthRateLibrary.cpp

@@ -5,7 +5,7 @@ uint8_t CreatureLib::Library::GrowthRateLibrary::CalculateLevel(const ArbUt::Bas
                                                                 uint32_t experience) const {
     auto find = _growthRates.find(growthRate);
     if (find == _growthRates.end()) {
-        throw CreatureException("Invalid growth rate was requested.");
+        THROW_CREATURE("Invalid growth rate was requested.");
     }
     return find->second->CalculateLevel(experience);
 }
@@ -13,7 +13,7 @@ uint8_t CreatureLib::Library::GrowthRateLibrary::CalculateLevel(const ArbUt::Bas
 uint8_t CreatureLib::Library::GrowthRateLibrary::CalculateLevel(uint32_t hash, uint32_t experience) const {
     auto find = _growthRates.find(hash);
     if (find == _growthRates.end()) {
-        throw CreatureException("Invalid growth rate was requested.");
+        THROW_CREATURE("Invalid growth rate was requested.");
     }
     return find->second->CalculateLevel(experience);
 }
@@ -22,7 +22,7 @@ uint32_t CreatureLib::Library::GrowthRateLibrary::CalculateExperience(const ArbU
                                                                       uint8_t level) const {
     auto find = _growthRates.find(growthRate);
     if (find == _growthRates.end()) {
-        throw CreatureException("Invalid growth rate was requested.");
+        THROW_CREATURE("Invalid growth rate was requested.");
     }
     return find->second->CalculateExperience(level);
 }
@@ -30,7 +30,7 @@ uint32_t CreatureLib::Library::GrowthRateLibrary::CalculateExperience(const ArbU
 uint32_t CreatureLib::Library::GrowthRateLibrary::CalculateExperience(uint32_t hash, uint8_t level) const {
     auto find = _growthRates.find(hash);
     if (find == _growthRates.end()) {
-        throw CreatureException("Invalid growth rate was requested.");
+        THROW_CREATURE("Invalid growth rate was requested.");
     }
     return find->second->CalculateExperience(level);
 }

tests/BattleTests/ScriptTests/ScriptAggregatorTests.cpp

@@ -133,7 +133,7 @@ TEST_CASE("Script Aggregator properly iterates when empty.", "[Battling, Scripti
     auto vec = ArbUt::List<ScriptWrapper>{};
     auto aggr = ScriptAggregator(vec);
     while (aggr.HasNext()) {
-        throw CreatureException("Aggregator returned a script, but should have been empty.");
+        THROW_CREATURE("Aggregator returned a script, but should have been empty.");
     }
     CHECK(ran == 0);
 }

tests/ExceptionTests.cpp

@@ -6,11 +6,11 @@
 TEST_CASE("When throwing exception, what() is readable", "[Utilities]") {
     bool hasCaught = false;
     try {
-        throw CreatureException("foobar");
+        THROW_CREATURE("foobar");
     } catch (const std::exception& e) {
         hasCaught = true;
         INFO(e.what());
-        REQUIRE(strcmp(e.what(), "foobar") == 0);
+        REQUIRE(std::string(e.what()) == "[ExceptionTests.cpp:9] foobar");
     }
     REQUIRE(hasCaught);
 }