From 6df9b659153475cf41facfaccfadc424a97cd008 Mon Sep 17 00:00:00 2001 From: Vincent Payet Date: Tue, 31 Dec 2024 10:09:40 +0100 Subject: [PATCH] split try catch for parameters --- src/solver/modeler/loadFiles/readParameters.cpp | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/solver/modeler/loadFiles/readParameters.cpp b/src/solver/modeler/loadFiles/readParameters.cpp index 240f47a1f4..a1a6658a45 100644 --- a/src/solver/modeler/loadFiles/readParameters.cpp +++ b/src/solver/modeler/loadFiles/readParameters.cpp @@ -34,19 +34,24 @@ namespace Antares::Solver::LoadFiles ModelerParameters loadParameters(const fs::path& studyPath) { std::string filename = "parameters.yml"; + std::string paramStr; try { - const std::string paramStr = IO::readFile(studyPath / filename); - return parseModelerParameters(paramStr); + paramStr = IO::readFile(studyPath / filename); } - catch (const YAML::Exception& e) + catch (const std::runtime_error& e) { - handleYamlError(e, filename); + handleRuntimeError(e, filename); throw ErrorLoadingYaml(e.what()); } - catch (const std::runtime_error& e) + + try { - handleRuntimeError(e, filename); + return parseModelerParameters(paramStr); + } + catch (const YAML::Exception& e) + { + handleYamlError(e, filename); throw ErrorLoadingYaml(e.what()); } }