diff options
Diffstat (limited to 'src/buildtool/build_engine/expression/evaluator.cpp')
| -rw-r--r-- | src/buildtool/build_engine/expression/evaluator.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp index 852d8c37..e2b3819d 100644 --- a/src/buildtool/build_engine/expression/evaluator.cpp +++ b/src/buildtool/build_engine/expression/evaluator.cpp @@ -862,8 +862,9 @@ auto ToSubdirExpr(SubExprEvaluator&& eval, for (auto const& el : d->Map()) { std::filesystem::path k{el.first}; auto new_key = ToNormalPath(subdir / k.filename()).string(); - if (result.contains(new_key) && - !((result[new_key] == el.second) && el.second->IsCacheable())) { + if (result.contains(new_key) and + not((result[new_key] == el.second) and + el.second->IsCacheable())) { // Check if the user specifed an error message for that case, // otherwise just generate a generic error message. auto msg_expr = expr->Map().Find("msg"); @@ -895,8 +896,8 @@ auto ToSubdirExpr(SubExprEvaluator&& eval, for (auto const& el : d->Map()) { auto new_key = ToNormalPath(subdir / el.first).string(); if (auto it = result.find(new_key); - it != result.end() && - (!((it->second == el.second) && el.second->IsCacheable()))) { + it != result.end() and + (not((it->second == el.second) and el.second->IsCacheable()))) { auto msg_expr = expr->Map().Find("msg"); if (not msg_expr) { throw Evaluator::EvaluationError{fmt::format( |