simplify expression contains functions (#306)

ckrause · web-flow · commit 24c441885518 · 2023-12-25T13:38:38.000+01:00
diff --git a/src/form/expression.cpp b/src/form/expression.cpp
@@ -105,24 +105,24 @@ bool Expression::contains(const Expression& e) const {
   if (*this == e) {
     return true;
   }
-  for (auto& c : children) {
-    if (c.contains(e)) {
-      return true;
-    }
-  }
-  return false;
+  return std::any_of(children.begin(), children.end(),
+                     [&](const Expression& c) { return c.contains(e); });
 }
 
 bool Expression::contains(Type t) const {
   if (type == t) {
     return true;
   }
-  for (auto& c : children) {
-    if (c.contains(t)) {
-      return true;
-    }
+  return std::any_of(children.begin(), children.end(),
+                     [&](const Expression& c) { return c.contains(t); });
+}
+
+bool Expression::contains(Type t, const std::string& name) const {
+  if (type == t && this->name == name) {
+    return true;
   }
-  return false;
+  return std::any_of(children.begin(), children.end(),
+                     [&](const Expression& c) { return c.contains(t, name); });
 }
 
 size_t Expression::numTerms() const {
diff --git a/src/form/expression.hpp b/src/form/expression.hpp
@@ -49,6 +49,8 @@ class Expression {
 
   bool contains(Type t) const;
 
+  bool contains(Type t, const std::string& name) const;
+
   size_t numTerms() const;
 
   Expression& newChild(const Expression& e);
