catch specific error in main

AntaresSimulatorTeam · Dec 24, 2024 · 663b786 · 663b786
1 parent b39407f
commit 663b786
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/src/solver/modeler/loadFiles/include/antares/solver/modeler/loadFiles/loadFiles.h b/src/solver/modeler/loadFiles/include/antares/solver/modeler/loadFiles/loadFiles.h
@@ -38,4 +38,14 @@ std::vector<Study::SystemModel::Library> loadLibraries(const std::filesystem::pa
 Study::SystemModel::System loadSystem(const std::filesystem::path& studyPath,
                                       const std::vector<Study::SystemModel::Library>& libraries);
 
+/// Generic error class for all loading errors to catch in the main
+class ErrorLoadingYaml: public std::runtime_error
+{
+public:
+    explicit ErrorLoadingYaml(const std::string& s):
+        runtime_error(s)
+    {
+    }
+};
+
 } // namespace Antares::Solver::LoadFiles
diff --git a/src/solver/modeler/loadFiles/readLibraries.cpp b/src/solver/modeler/loadFiles/readLibraries.cpp
@@ -34,12 +34,12 @@ namespace Antares::Solver::LoadFiles
 
 static Study::SystemModel::Library loadSingleLibrary(const fs::path& filePath)
 {
-    const std::string libraryStr = IO::readFile(filePath);
-
-    ModelParser::Parser parser;
     try
     {
+        const std::string libraryStr = IO::readFile(filePath);
+        ModelParser::Parser parser;
         ModelParser::Library libraryObj = parser.parse(libraryStr);
+
         return ModelConverter::convert(libraryObj);
     }
     catch (const YAML::Exception& e)
@@ -51,15 +51,15 @@ static Study::SystemModel::Library loadSingleLibrary(const fs::path& filePath)
         }
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
     catch (const std::runtime_error& e)
     {
         logs.error() << "Error while parsing or converting this library yaml file:";
         logs.error() << filePath;
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
 }
 

diff --git a/src/solver/modeler/loadFiles/readParameters.cpp b/src/solver/modeler/loadFiles/readParameters.cpp
@@ -47,14 +47,14 @@ ModelerParameters loadParameters(const fs::path& studyPath)
         }
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
     catch (const std::runtime_error& e)
     {
         logs.error() << "Error while parsing the yaml parameters file:";
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
 }
 

diff --git a/src/solver/modeler/loadFiles/readSystem.cpp b/src/solver/modeler/loadFiles/readSystem.cpp
@@ -35,12 +35,12 @@ namespace Antares::Solver::LoadFiles
 Study::SystemModel::System loadSystem(const fs::path& studyPath,
                                       const std::vector<Study::SystemModel::Library>& libraries)
 {
-    const std::string systemStr = IO::readFile(studyPath / "input" / "system.yml");
-    SystemParser::Parser parser;
-
     try
     {
+        const std::string systemStr = IO::readFile(studyPath / "input" / "system.yml");
+        SystemParser::Parser parser;
         SystemParser::System systemObj = parser.parse(systemStr);
+
         return SystemConverter::convert(systemObj, libraries);
     }
     catch (const YAML::Exception& e)
@@ -52,14 +52,14 @@ Study::SystemModel::System loadSystem(const fs::path& studyPath,
         }
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
     catch (const std::runtime_error& e)
     {
         logs.error() << "Error while parsing or converting the system file:";
         logs.error() << e.what();
 
-        throw std::runtime_error(e.what());
+        throw ErrorLoadingYaml(e.what());
     }
 }
 

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