catch yaml exception, use mark if available

AntaresSimulatorTeam · Dec 23, 2024 · 9d93c9d · 9d93c9d
1 parent f8c3d70
commit 9d93c9d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/src/solver/modeler/loadFiles/readLibraries.cpp b/src/solver/modeler/loadFiles/readLibraries.cpp
@@ -19,6 +19,8 @@
  * along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
  */
 
+#include <yaml-cpp/yaml.h>
+
 #include <antares/io/file.h>
 #include <antares/logs/logs.h>
 #include <antares/solver/modelConverter/modelConverter.h>
@@ -35,12 +37,22 @@ static Study::SystemModel::Library loadSingleLibrary(const fs::path& filePath)
     const std::string libraryStr = IO::readFile(filePath);
 
     ModelParser::Parser parser;
-
     try
     {
         ModelParser::Library libraryObj = parser.parse(libraryStr);
         return ModelConverter::convert(libraryObj);
     }
+    catch (const YAML::Exception& e)
+    {
+        logs.error() << "Error while parsing this library yaml file: " << filePath;
+        if (!e.mark.is_null())
+        {
+            logs.error() << "Line " << e.mark.line << " column " << e.mark.column;
+        }
+        logs.error() << e.what();
+
+        throw std::runtime_error(e.what());
+    }
     catch (const std::runtime_error& e)
     {
         logs.error() << "Error while parsing or converting this library yaml file:";

diff --git a/src/solver/modeler/loadFiles/readSystem.cpp b/src/solver/modeler/loadFiles/readSystem.cpp
@@ -19,6 +19,8 @@
  * along with Antares_Simulator. If not, see <https://opensource.org/license/mpl-2-0/>.
  */
 
+#include <yaml-cpp/yaml.h>
+
 #include <antares/io/file.h>
 #include <antares/logs/logs.h>
 #include <antares/solver/systemParser/converter.h>
@@ -41,6 +43,17 @@ Study::SystemModel::System loadSystem(const fs::path& studyPath,
         SystemParser::System systemObj = parser.parse(systemStr);
         return SystemConverter::convert(systemObj, libraries);
     }
+    catch (const YAML::Exception& e)
+    {
+        logs.error() << "Error while parsing the yaml system file";
+        if (!e.mark.is_null())
+        {
+            logs.error() << "Line " << e.mark.line << " column " << e.mark.column;
+        }
+        logs.error() << e.what();
+
+        throw std::runtime_error(e.what());
+    }
     catch (const std::runtime_error& e)
     {
         logs.error() << "Error while parsing or converting the system file:";

diff --git a/src/solver/modeler/main.cpp b/src/solver/modeler/main.cpp
@@ -43,9 +43,17 @@ int main(int argc, const char** argv)
         return EXIT_FAILURE;
     }
 
-    const auto parameters = LoadFiles::parseModelerParameters(studyPath);
-    const auto libraries = LoadFiles::loadLibraries(studyPath);
-    const auto system = LoadFiles::loadSystem(studyPath, libraries);
+    try
+    {
+        const auto parameters = LoadFiles::parseModelerParameters(studyPath);
+        const auto libraries = LoadFiles::loadLibraries(studyPath);
+        const auto system = LoadFiles::loadSystem(studyPath, libraries);
+    }
+    catch (...)
+    {
+        logs.error() << "Error while loading files, exiting";
+        return EXIT_FAILURE;
+    }
 
     return 0;
 }