debug2

Author: Flamefire

libs/libGamedata/lua/GameDataLoader.cpp

@@ -15,8 +15,8 @@
 #include "s25util/Log.h"
 #include <kaguya/kaguya.hpp>
 #include <boost/filesystem.hpp>
-#include <stdexcept>
 #include <iostream>
+#include <stdexcept>
 
 namespace bfs = boost::filesystem;
 
@@ -41,6 +41,7 @@ bool GameDataLoader::Load()
     curFile_ = basePath_ / "default.lua";
     curIncludeDepth_ = 0;
     errorInIncludeFile_ = false;
+    std::cerr << "Start loading " << curFile_ << std::endl;
     try
     {
         bool res = loadScript(curFile_);
@@ -99,12 +100,17 @@ void GameDataLoader::Include(const std::string& filepath)
         const auto oldCurFile = curFile_;
         curFile_ = absFilePath;
         ++curIncludeDepth_;
+        std::cerr << "Include " << absFilePath << " LEvel " << curIncludeDepth_ << ' '
+                  << static_cast<void*>(&errorInIncludeFile_) << '\n';
         errorInIncludeFile_ |= !loadScript(absFilePath);
+        std::cerr << "DONE w/ " << absFilePath << " LEvel " << curIncludeDepth_ << ' '
+                  << static_cast<void*>(&errorInIncludeFile_) << '\n';
         curFile_ = oldCurFile;
         RTTR_Assert(curIncludeDepth_ > 0);
         --curIncludeDepth_;
     } catch(const LuaIncludeError& e)
     {
+        std::cerr << helpers::format("Include file '%1%' cannot be included: %2%", filepath, e.what()) << '\n';
         throw std::runtime_error(helpers::format("Include file '%1%' cannot be included: %2%", filepath, e.what()));
     }
 }

libs/libGamedata/lua/LuaInterfaceBase.cpp

@@ -13,6 +13,7 @@
 #include <boost/nowide/detail/convert.hpp> // TODO: Remove when requiring Nowide 11 / Boost 1.74
 #include <boost/nowide/fstream.hpp>
 #include <algorithm>
+#include <iostream>
 
 LuaInterfaceBase::LuaInterfaceBase() : lua(kaguya::NoLoadLib()), logger_(LOG), errorOccured_(false)
 {
@@ -66,6 +67,7 @@ bool LuaInterfaceBase::loadScript(const boost::filesystem::path& scriptPath)
         tmpScript.erase(0, 3);
     if(!loadScriptString(tmpScript))
     {
+        std::cerr << "Failed to load " << scriptPath << '\n';
         logger_.write(_("Failed to load lua file '%1%'\n")) % scriptPath;
         return false;
     }
@@ -85,6 +87,7 @@ bool LuaInterfaceBase::loadScriptString(const std::string& script, bool rethrowE
             script_ = script;
     } catch(const LuaExecutionError&)
     {
+        std::cerr << "LuaExecutionError\n";
         if(rethrowError)
             throw;
         return false;

tests/libGameData/testGameData.cpp

@@ -125,7 +125,14 @@ BOOST_AUTO_TEST_CASE(DetectRecursion)
     WorldDescription desc;
     GameDataLoader loader(desc, tmp);
     rttr::test::LogAccessor logAcc;
+    std::cerr << "Start load\n";
+    bool res = loader.Load();
+    BOOST_TEST(!res);
+    std::cerr << "End load\n";
+    RTTR_REQUIRE_LOG_CONTAINS("Maximum include depth", false);
+    std::cerr << "Start load\n";
     BOOST_TEST(!loader.Load());
+    std::cerr << "End load\n";
     RTTR_REQUIRE_LOG_CONTAINS("Maximum include depth", false);
 }