Update checkstl.cpp

Author: chrchr-github

lib/checkstl.cpp

@@ -1959,29 +1959,53 @@ static bool isLocal(const Token *tok)
     return var && !var->isStatic() && var->isLocal();
 }
 
+static bool isc_strCall(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "("))
+        return false;
+    const Token* dot = tok->astOperand1();
+    if (!Token::simpleMatch(dot, "."))
+        return false;
+    const Token* obj = dot->astOperand1();
+    if (!obj || !obj->valueType() || !obj->valueType()->container || !obj->valueType()->container->stdStringLike)
+        return false;
+    return Token::Match(dot->astOperand2(), "c_str|data ( )");
+}
+
 static bool isc_strConcat(const Token* tok)
 {
     if (!Token::simpleMatch(tok, "+"))
         return false;
     const Token* cstr = nullptr;
     for (const Token* op : { tok->astOperand1(), tok->astOperand2() }) {
-        if (!Token::simpleMatch(op, "("))
-            continue;
-        const Token* dot = op->astOperand1();
-        if (!Token::simpleMatch(dot, ".") || !dot->astOperand1())
-            continue;
-        const ValueType* vtObject = dot->astOperand1()->valueType();
-        if (!vtObject || !vtObject->container || !vtObject->container->stdStringLike)
-            continue;
-        if (!Token::Match(dot->astOperand2(), "c_str|data ( )"))
-            continue;
-        cstr = op;
-        break;
+        if (isc_strCall(op)) {
+            cstr = op;
+            break;
+        }
     }
     if (!cstr)
         return false;
-    const ValueType* vtStr = (cstr == tok->astOperand1() ? tok->astOperand2() : tok->astOperand1())->valueType();
-    return vtStr && vtStr->container && vtStr->container->stdStringLike;
+    const Token* strTok = (cstr == tok->astOperand1()) ? tok->astOperand2() : tok->astOperand1();
+    return strTok->valueType() && strTok->valueType()->container && strTok->valueType()->container->stdStringLike;
+}
+
+static bool isc_strAssignment(const Token* tok)
+{
+    if (!Token::simpleMatch(tok, "="))
+        return false;
+    if (!isc_strCall(tok->astOperand2()))
+        return false;
+    const Token* strTok = tok->astOperand1();
+    return strTok && strTok->valueType() && strTok->valueType()->container && strTok->valueType()->container->stdStringLike;
+}
+
+static bool isc_strConstructor(const Token* tok)
+{
+    if (!Token::Match(tok, "%var% (|{"))
+        return false;
+    if (!isc_strCall(tok->tokAt(1)->astOperand2()))
+        return false;
+    return tok->valueType() && tok->valueType()->container && tok->valueType()->container->stdStringLike;
 }
 
 namespace {
@@ -2052,16 +2076,14 @@ void CheckStl::string_c_str()
                     const Variable* var2 = tok->tokAt(2)->variable();
                     if (var->isPointer() && var2 && var2->isStlType(stl_string_stream))
                         string_c_strError(tok);
+                } else if (printPerformance && isc_strAssignment(tok->tokAt(1))) {
+                    string_c_strAssignment(tok, tok->variable()->getTypeName());
                 } else if (Token::Match(tok->tokAt(2), "%name% (") &&
                            Token::Match(tok->linkAt(3), ") . c_str|data ( ) ;") &&
                            tok->tokAt(2)->function() && Token::Match(tok->tokAt(2)->function()->retDef, "std :: string|wstring %name%")) {
                     const Variable* var = tok->variable();
                     if (var->isPointer())
                         string_c_strError(tok);
-                } else if (printPerformance && tok->tokAt(1)->astOperand2() && Token::Match(tok->tokAt(1)->astOperand2()->tokAt(-3), "%var% . c_str|data ( ) ;")) {
-                    const Token* vartok = tok->tokAt(1)->astOperand2()->tokAt(-3);
-                    if ((tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) && vartok->variable() && vartok->variable()->isStlStringType())
-                        string_c_strAssignment(tok, tok->variable()->getTypeName());
                 }
             } else if (printPerformance && tok->function() && Token::Match(tok, "%name% ( !!)") && tok->str() != scope.className) {
                 const auto range = c_strFuncParam.equal_range(tok->function());
@@ -2093,9 +2115,7 @@ void CheckStl::string_c_str()
                         }
                     }
                 }
-            } else if (printPerformance && Token::Match(tok, "%var% (|{ %var% . c_str|data ( ) !!,") &&
-                       tok->variable() && (tok->variable()->isStlStringType() || tok->variable()->isStlStringViewType()) &&
-                       tok->tokAt(2)->variable() && tok->tokAt(2)->variable()->isStlStringType()) {
+            } else if (printPerformance && isc_strConstructor(tok)) {
                 string_c_strConstructor(tok, tok->variable()->getTypeName());
             } else if (printPerformance && isc_strConcat(tok)) {
                 string_c_strConcat(tok);