From da6b17d17672f569ce8fa5575a82243f25502449 Mon Sep 17 00:00:00 2001
From: PKEuS <philipp.kloke@web.de>
Date: Fri, 13 Nov 2015 13:22:47 +0100
Subject: [PATCH] Refactorizations in CheckStl: - Improved detection of "auto"
 iterators in CheckStl::iterators() - Improved performance of
 CheckStl::pushback() - Added more containers to std.cfg

---
 cfg/std.cfg      | 16 ++++++++++++++--
 lib/checkstl.cpp | 21 +++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index cd49197f2..52dff050b 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -4028,18 +4028,30 @@
       <function name="data" yields="buffer"/>
     </access>
   </container>
-  <container id="stdSet" startPattern="std :: set &lt;" inherits="stdContainer">
+  <container id="stdSet" startPattern="std :: set|unoredered_set|multiset|unoredered_multiset &lt;" inherits="stdContainer">
     <access>
       <function name="find" action="find"/>
     </access>
   </container>
-  <container id="stdMap" startPattern="std :: map &lt;" inherits="stdContainer">
+  <container id="stdMap" startPattern="std :: map|unordered_map|multimap|unordered_multimap &lt;" inherits="stdContainer">
     <type templateParameter="1"/>
     <access>
       <function name="at" yields="at_index"/>
       <function name="find" action="find"/>
     </access>
   </container>
+  <container id="stdList" startPattern="std :: list &lt;" inherits="stdContainer">
+    <size>
+      <function name="push_back" action="push"/>
+      <function name="pop_back" action="pop"/>
+      <function name="push_front" action="push"/>
+      <function name="pop_front" action="pop"/>
+    </size>
+    <access>
+      <function name="front" yields="item"/>
+      <function name="back" yields="item"/>
+    </access>
+  </container>
   <container id="stdComplex" startPattern="std :: complex &lt;" endPattern="&gt; !!::">
     <type templateParameter="1"/>
   </container>
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
index 147703466..dd7eff77d 100644
--- a/lib/checkstl.cpp
+++ b/lib/checkstl.cpp
@@ -68,8 +68,6 @@ void CheckStl::iterators()
 {
     const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
 
-    // Using same iterator against different containers.
-    // for (it = foo.begin(); it != bar.end(); ++it)
     for (unsigned int iteratorId = 1; iteratorId < symbolDatabase->getVariableListSize(); iteratorId++) {
         const Variable* var = symbolDatabase->getVariableFromVarId(iteratorId);
 
@@ -77,8 +75,19 @@ void CheckStl::iterators()
         if (!var || !var->isLocal() || !Token::Match(var->typeEndToken(), "iterator|const_iterator|reverse_iterator|const_reverse_iterator|auto"))
             continue;
 
-        if (var->typeEndToken()->str() == "auto" && !Token::Match(var->typeEndToken(), "auto %name% ; %name% = %name% . begin|end ( )"))
-            continue;
+        if (var->typeEndToken()->str() == "auto") {
+            if (Token::Match(var->typeEndToken(), "auto %name% ; %name% = %var% . %name% ( )")) {
+                const Token* containertok = var->typeEndToken()->tokAt(5);
+                const Library::Container* container = _settings->library.detectContainer(containertok->variable()->typeStartToken());
+                if (!container)
+                    continue;
+
+                Library::Container::Yield yield = container->getYield(containertok->strAt(2));
+                if (yield != Library::Container::END_ITERATOR && yield != Library::Container::START_ITERATOR)
+                    continue;
+            } else
+                continue;
+        }
 
         if (var->type()) { // If it is defined, ensure that it is defined like an iterator
             // look for operator* and operator++
@@ -437,6 +446,10 @@ void CheckStl::pushback()
         const Scope * scope = symbolDatabase->functionScopes[i];
         for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
             if (Token::Match(tok, "%var% = & %var% [")) {
+                // Skip it directly if it is a pointer or an array
+                if (tok->tokAt(3)->variable()->isArrayOrPointer())
+                    continue;
+
                 // Variable id for pointer
                 const unsigned int pointerId(tok->varId());