summaryrefslogtreecommitdiff
path: root/src/buildtool/build_engine/expression/evaluator.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/buildtool/build_engine/expression/evaluator.cpp')
-rw-r--r--src/buildtool/build_engine/expression/evaluator.cpp20
1 files changed, 5 insertions, 15 deletions
diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp
index 18fe7a76..ea2f547e 100644
--- a/src/buildtool/build_engine/expression/evaluator.cpp
+++ b/src/buildtool/build_engine/expression/evaluator.cpp
@@ -1399,17 +1399,11 @@ auto Evaluator::EvaluateExpression(
FunctionMap::MakePtr(kBuiltInFunctions, provider_functions));
} catch (EvaluationError const& ex) {
if (ex.UserContext()) {
- try {
- note_user_context();
- } catch (...) {
- // should not throw
- }
+ note_user_context();
}
- else {
- if (ex.WhileEvaluation()) {
- ss << "Expression evaluation traceback (most recent call last):"
- << std::endl;
- }
+ else if (ex.WhileEvaluation()) {
+ ss << "Expression evaluation traceback (most recent call last):"
+ << std::endl;
}
ss << ex.what();
for (auto const& object : ex.InvolvedObjects()) {
@@ -1418,11 +1412,7 @@ auto Evaluator::EvaluateExpression(
} catch (std::exception const& ex) {
ss << ex.what();
}
- try {
- logger(ss.str());
- } catch (...) {
- // should not throw
- }
+ logger(ss.str());
return ExpressionPtr{nullptr};
}