From b5ed13c8bc8b665a92846db1cd4162d3bbcaec3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20St=C3=B6neberg?=
 <firewave@users.noreply.github.com>
Date: Tue, 8 Feb 2022 09:02:59 +0100
Subject: [PATCH] checkstl.cpp: removed unused global containers and made a
 std::string a literal so it can be matchcompiled (#3801)

---
 lib/checkstl.cpp | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index 447f99ee0..db78a1b28 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -662,31 +662,6 @@ void CheckStl::sameIteratorExpressionError(const Token *tok)
     reportError(tok, Severity::style, "sameIteratorExpression", "Same iterators expression are used for algorithm.", CWE664, Certainty::normal);
 }
 
-static const std::set<std::string> algorithm2 = { // func(begin1, end1
-    "binary_search", "copy", "copy_if", "equal_range"
-    , "generate", "is_heap", "is_heap_until", "is_partitioned"
-    , "is_permutation", "is_sorted", "is_sorted_until", "lower_bound", "make_heap", "max_element", "minmax_element"
-    , "min_element", "mismatch", "move", "move_backward", "next_permutation", "partition", "partition_copy"
-    , "partition_point", "pop_heap", "prev_permutation", "push_heap", "random_shuffle", "remove", "remove_copy"
-    , "remove_copy_if", "remove_if", "replace", "replace_copy", "replace_copy_if", "replace_if", "reverse", "reverse_copy"
-    , "shuffle", "sort", "sort_heap", "stable_partition", "stable_sort", "swap_ranges", "transform", "unique"
-    , "unique_copy", "upper_bound", "string", "wstring", "u16string", "u32string"
-};
-static const std::set<std::string> algorithm22 = { // func(begin1, end1, begin2, end2
-    "includes", "lexicographical_compare", "merge", "partial_sort_copy"
-    , "set_difference", "set_intersection", "set_symmetric_difference", "set_union"
-};
-static const std::set<std::string> algorithm1x1 = {  // func(begin1, x, end1
-    "nth_element", "partial_sort", "rotate", "rotate_copy"
-};
-
-static const std::string iteratorBeginFuncPattern = "begin|cbegin|rbegin|crbegin";
-static const std::string iteratorEndFuncPattern = "end|cend|rend|crend";
-
-static const std::string pattern1x1_1 = "%name% . " + iteratorBeginFuncPattern + " ( ) , ";
-static const std::string pattern1x1_2 = "%name% . " + iteratorEndFuncPattern + " ( ) ,|)";
-static const std::string pattern2 = pattern1x1_1 + pattern1x1_2;
-
 static const Token * getIteratorExpression(const Token * tok)
 {
     if (!tok)
@@ -842,7 +817,8 @@ void CheckStl::mismatchingContainers()
         }
     }
     for (const Variable *var : symbolDatabase->variableList()) {
-        if (var && var->isStlStringType() && Token::Match(var->nameToken(), "%var% (") && Token::Match(var->nameToken()->tokAt(2), pattern2.c_str())) {
+        if (var && var->isStlStringType() && Token::Match(var->nameToken(), "%var% (") &&
+            Token::Match(var->nameToken()->tokAt(2), "%name% . begin|cbegin|rbegin|crbegin ( ) , %name% . end|cend|rend|crend ( ) ,|)")) {
             if (var->nameToken()->strAt(2) != var->nameToken()->strAt(8)) {
                 mismatchingContainersError(var->nameToken(), var->nameToken()->tokAt(2));
             }