Updating a utility function cont.

Author: svorenova

unit/testing-utils/require_parse_tree.cpp

@@ -11,10 +11,10 @@
 /// Find in the parsed class a specific entry within the
 /// lambda_method_handle_map with a matching descriptor. Will fail if no
 /// matching lambda entry found.
-/// \param parsed_class: the class to inspect
-/// \param lambda_method_ref: the reference/descriptor of the lambda method
-/// to which this lambda entry points to, must be unique
-/// \param method_type: the descriptor the lambda method should have
+/// \param parsed_class the class to inspect
+/// \param lambda_method_ref the reference/descriptor of the lambda method
+///   to which this lambda entry points to, must be unique
+/// \param method_type the descriptor the lambda method should have
 /// \return
 require_parse_tree::lambda_method_handlet
 require_parse_tree::require_lambda_entry_for_descriptor(
@@ -29,28 +29,20 @@ require_parse_tree::require_lambda_entry_for_descriptor(
     "Looking for entry with lambda_method_ref: " << lambda_method_ref
                                                  << " and method_type: "
                                                  << method_type);
-  const auto num_matches = std::count_if(
+  std::vector<lambda_method_entryt> matches;
+  std::copy_if(
     parsed_class.lambda_method_handle_map.begin(),
     parsed_class.lambda_method_handle_map.end(),
-    [&method_type, &lambda_method_ref](const lambda_method_entryt &entry) {
+    back_inserter(matches),
+    [&method_type,
+     &lambda_method_ref](const lambda_method_entryt &entry) { //NOLINT
       return (
         entry.second.method_type == method_type &&
         entry.second.lambda_method_ref == lambda_method_ref);
     });
-
-  REQUIRE(num_matches == 1);
-  INFO("Entry found");
-  const auto matching_lambda_entry = std::find_if(
-    parsed_class.lambda_method_handle_map.begin(),
-    parsed_class.lambda_method_handle_map.end(),
-    [&method_type, &lambda_method_ref](const lambda_method_entryt &entry) {
-      return (
-        entry.second.method_type == method_type &&
-        entry.second.lambda_method_ref == lambda_method_ref);
-    });
-  REQUIRE(matching_lambda_entry != parsed_class.lambda_method_handle_map.end());
-
-  return matching_lambda_entry->second;
+  INFO("Number of matching lambda method entries: " << matches.size());
+  REQUIRE(matches.size() == 1);
+  return matches.at(0).second;
 }
 
 /// Finds a specific method in the parsed class with a matching name.