From d209dd3dfa9f8066be08c4610134e0f7c7873633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 17 Jul 2024 15:34:07 +0200
Subject: [PATCH] C++20 modernization: use std::ranges::any_of
---
src/DataTree.cc | 10 +++++-----
src/ExprNode.cc | 8 ++++----
src/SymbolTable.cc | 7 +++----
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/DataTree.cc b/src/DataTree.cc
index 49303d68..6deb8b79 100644
--- a/src/DataTree.cc
+++ b/src/DataTree.cc
@@ -1,5 +1,5 @@
/*
- * Copyright © 2003-2023 Dynare Team
+ * Copyright © 2003-2024 Dynare Team
*
* This file is part of Dynare.
*
@@ -842,8 +842,8 @@ DataTree::addAllParamDerivId([[maybe_unused]] set<int>& deriv_id_set)
bool
DataTree::isUnaryOpUsed(UnaryOpcode opcode) const
{
- return any_of(unary_op_node_map.begin(), unary_op_node_map.end(),
- [=](const auto& it) { return get<1>(it.first) == opcode; });
+ return ranges::any_of(unary_op_node_map,
+ [=](const auto& it) { return get<1>(it.first) == opcode; });
}
bool
@@ -863,8 +863,8 @@ DataTree::isUnaryOpUsedOnType(SymbolType type, UnaryOpcode opcode) const
bool
DataTree::isBinaryOpUsed(BinaryOpcode opcode) const
{
- return any_of(binary_op_node_map.begin(), binary_op_node_map.end(),
- [=](const auto& it) { return get<2>(it.first) == opcode; });
+ return ranges::any_of(binary_op_node_map,
+ [=](const auto& it) { return get<2>(it.first) == opcode; });
}
bool
diff --git a/src/ExprNode.cc b/src/ExprNode.cc
index 35e83b31..e72e446c 100644
--- a/src/ExprNode.cc
+++ b/src/ExprNode.cc
@@ -7270,15 +7270,15 @@ AbstractExternalFunctionNode::isVariableNodeEqualTo([[maybe_unused]] SymbolType
bool
AbstractExternalFunctionNode::containsPacExpectation(const string& pac_model_name) const
{
- return any_of(arguments.begin(), arguments.end(),
- [&](expr_t e) { return e->containsPacExpectation(pac_model_name); });
+ return ranges::any_of(arguments,
+ [&](expr_t e) { return e->containsPacExpectation(pac_model_name); });
}
bool
AbstractExternalFunctionNode::containsPacTargetNonstationary(const string& pac_model_name) const
{
- return any_of(arguments.begin(), arguments.end(),
- [&](expr_t e) { return e->containsPacTargetNonstationary(pac_model_name); });
+ return ranges::any_of(
+ arguments, [&](expr_t e) { return e->containsPacTargetNonstationary(pac_model_name); });
}
expr_t
diff --git a/src/SymbolTable.cc b/src/SymbolTable.cc
index 94045162..c46f2458 100644
--- a/src/SymbolTable.cc
+++ b/src/SymbolTable.cc
@@ -1,5 +1,5 @@
/*
- * Copyright © 2003-2023 Dynare Team
+ * Copyright © 2003-2024 Dynare Team
*
* This file is part of Dynare.
*
@@ -895,14 +895,13 @@ SymbolTable::getEndogenous() const
bool
SymbolTable::isAuxiliaryVariable(int symb_id) const
{
- return any_of(aux_vars.begin(), aux_vars.end(),
- [=](const auto& av) { return av.symb_id == symb_id; });
+ return ranges::any_of(aux_vars, [=](const auto& av) { return av.symb_id == symb_id; });
}
bool
SymbolTable::isDiffAuxiliaryVariable(int symb_id) const
{
- return any_of(aux_vars.begin(), aux_vars.end(), [=](const auto& av) {
+ return ranges::any_of(aux_vars, [=](const auto& av) {
return av.symb_id == symb_id
&& (av.type == AuxVarType::diff || av.type == AuxVarType::diffLag
|| av.type == AuxVarType::diffLead);
--
GitLab