Update BuildData

CMakeLists.txt

@@ -21,7 +21,6 @@ endif ()
 
 file(GLOB_RECURSE SRC_FILES src/*.cpp src/*.hpp extern/AngelscriptDebugger/src/*.cpp)
 add_executable(PokemonScriptTester ${SRC_FILES})
-target_precompile_headers(PokemonScriptTester PUBLIC src/Precompiled.hxx)
 add_definitions(-DLEVEL_U8)
 
 SET(_LINKS -static pkmnLib)

CMakeLists.txt.in

@@ -40,6 +40,8 @@ function(include_pkmnlib)
     execute_process(COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include)
     execute_process(COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/src
             ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib)
+    execute_process(COMMAND ln -s ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/extern
+            ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/extern)
     execute_process(COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/src/pkmnlib/extern
             ${CMAKE_CURRENT_BINARY_DIR}/PkmnLib/include/PkmnLib/extern)
 

src/Precompiled.hxx

@@ -1,6 +0,0 @@
-#ifndef POKEMONSCRIPTTESTER_PRECOMPILED_HXX
-#define POKEMONSCRIPTTESTER_PRECOMPILED_HXX
-
-#include <PkmnLib/Precompiled.hxx>
-
-#endif // POKEMONSCRIPTTESTER_PRECOMPILED_HXX

src/Tester/AngelScript/BattleFunctions.hpp

@@ -155,7 +155,7 @@ class BattleFunctions {
     static void LearnMove(PkmnLib::Battling::Pokemon* user, const ArbUt::StringView& moveName) {
         auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName);
         if (!move.has_value()) {
-            THROW("Unknown move: " << moveName);
+            THROW("Unknown move: ", moveName);
         }
         user->AddAttack(
             new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown));

src/Tester/AngelScript/MiscMockFunctions.hpp

@@ -5,7 +5,8 @@
 
 class MiscMockFunctions {
     static CScriptHandle CreateMoveScript(const ArbUt::StringView& name) {
-        auto script = Globals::Library.GetValue()->GetScriptResolver()->LoadScript(ScriptCategory::Attack, name);
+        auto script =
+            Globals::Library.GetValue()->GetScriptResolver()->LoadScript(nullptr, ScriptCategory::Attack, name);
         if (script != nullptr) {
             auto* ctx = asGetActiveContext();
             TestEnvironment* env = static_cast<TestEnvironment*>(ctx->GetUserData(684));
@@ -25,7 +26,7 @@ class MiscMockFunctions {
 
         auto move = Globals::Library.GetValue()->GetMoveLibrary()->TryGet(moveName);
         if (!move.has_value()) {
-            return {};
+            THROW("Unknown move: ", moveName);
         }
         auto learnedMove =
             new PkmnLib::Battling::LearnedMove(move.value(), CreatureLib::Battling::AttackLearnMethod::Unknown);

src/Tester/Test.hpp

@@ -26,7 +26,13 @@ public:
 
         _env->CollectGarbage();
         if (e == asEXECUTION_EXCEPTION) {
-            _errorMessage = ctx->GetExceptionString();
+            std::stringstream error;
+            const char* exceptionSection = "";
+            int exceptionColumn = 0;
+            auto exceptionLine = ctx->GetExceptionLineNumber(&exceptionColumn, &exceptionSection);
+            error << "[" << exceptionSection << ":" << exceptionLine << "," << exceptionColumn << "] "
+                  << ctx->GetExceptionString();
+            _errorMessage = error.str();
             _result = TestResult::Failed;
             ctx->PopState();
             return;