Refactorizations:

PKEuS · PKEuS · commit d2146844dd99 · 2018-04-11T09:44:35.000+02:00
- Replace several push_back-calls by emplace_back
- Replace some x = x.substr(0, y) calls by x.erase(y)
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -294,7 +294,7 @@ unsigned int ThreadExecutor::check()
                     oss << "Internal error: Child process crashed with signal " << WTERMSIG(stat);
 
                     std::list<ErrorLogger::ErrorMessage::FileLocation> locations;
-                    locations.push_back(ErrorLogger::ErrorMessage::FileLocation(childname, 0));
+                    locations.emplace_back(childname, 0);
                     const ErrorLogger::ErrorMessage errmsg(locations,
                                                            emptyString,
                                                            Severity::error,
diff --git a/lib/analyzerinfo.cpp b/lib/analyzerinfo.cpp
@@ -90,7 +90,7 @@ static bool skipAnalysis(const std::string &analyzerInfoFile, unsigned long long
 
     for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {
         if (std::strcmp(e->Name(), "error") == 0)
-            errors->push_back(ErrorLogger::ErrorMessage(e));
+            errors->emplace_back(e);
     }
 
     return true;
diff --git a/lib/check.h b/lib/check.h
@@ -162,16 +162,16 @@ class CPPCHECKLIB Check {
     ErrorPath getErrorPath(const Token *errtok, const ValueFlow::Value *value, const std::string &bug) const {
         ErrorPath errorPath;
         if (!value) {
-            errorPath.push_back(ErrorPathItem(errtok,bug));
+            errorPath.emplace_back(errtok,bug);
         } else if (_settings->verbose || _settings->xml || _settings->outputFormat == "daca2") {
             errorPath = value->errorPath;
-            errorPath.push_back(ErrorPathItem(errtok,bug));
+            errorPath.emplace_back(errtok,bug);
         } else {
             if (value->condition)
-                errorPath.push_back(ErrorPathItem(value->condition, "condition '" + value->condition->expressionString() + "'"));
+                errorPath.emplace_back(value->condition, "condition '" + value->condition->expressionString() + "'");
             //else if (!value->isKnown() || value->defaultArg)
             //    errorPath = value->callstack;
-            errorPath.push_back(ErrorPathItem(errtok,bug));
+            errorPath.emplace_back(errtok,bug);
         }
         return errorPath;
     }
diff --git a/lib/checkbufferoverrun.cpp b/lib/checkbufferoverrun.cpp
@@ -103,14 +103,14 @@ void CheckBufferOverrun::arrayIndexOutOfBoundsError(const Token *tok, const Arra
                 std::string nr;
                 if (index.size() > 1U)
                     nr = "(" + MathLib::toString(i + 1) + getOrdinalText(i + 1) + " array index) ";
-                errorPath.push_back(ErrorPathItem(it->first, nr + info));
+                errorPath.emplace_back(it->first, nr + info);
             }
         }
-        errorPath.push_back(ErrorPathItem(tok,"Array index out of bounds"));
+        errorPath.emplace_back(tok,"Array index out of bounds");
     } else {
-        errorPath.push_back(ErrorPathItem(tok, "Array index out of bounds"));
+        errorPath.emplace_back(tok, "Array index out of bounds");
         if (condition)
-            errorPath.push_back(ErrorPathItem(condition, "Assuming that condition '" + condition->expressionString() + "' is not redundant"));
+            errorPath.emplace_back(condition, "Assuming that condition '" + condition->expressionString() + "' is not redundant");
     }
 
     if (condition != nullptr) {
diff --git a/lib/checkclass.cpp b/lib/checkclass.cpp
@@ -2115,13 +2115,13 @@ void CheckClass::initializerListOrder()
                         if (Token::Match(tok, "%name% (|{")) {
                             const Variable *var = scope->getVariable(tok->str());
                             if (var)
-                                vars.push_back(VarInfo(var, tok));
+                                vars.emplace_back(var, tok);
 
                             if (Token::Match(tok->tokAt(2), "%name% =")) {
                                 var = scope->getVariable(tok->strAt(2));
 
                                 if (var)
-                                    vars.push_back(VarInfo(var, tok->tokAt(2)));
+                                    vars.emplace_back(var, tok->tokAt(2));
                             }
                             tok = tok->next()->link()->next();
                         } else
@@ -2303,7 +2303,7 @@ void CheckClass::virtualFunctionCallInConstructorError(
     ErrorPath errorPath;
     int lineNumber = 1;
     for (std::list<const Token *>::const_iterator it = tokStack.begin(); it != tokStack.end(); ++it)
-        errorPath.push_back(ErrorPathItem(*it, "Calling " + (*it)->str()));
+        errorPath.emplace_back(*it, "Calling " + (*it)->str());
     if (!errorPath.empty()) {
         lineNumber = errorPath.front().first->linenr();
         errorPath.back().second = funcname + " is a virtual method";
@@ -2337,7 +2337,7 @@ void CheckClass::pureVirtualFunctionCallInConstructorError(
 
     ErrorPath errorPath;
     for (std::list<const Token *>::const_iterator it = tokStack.begin(); it != tokStack.end(); ++it)
-        errorPath.push_back(ErrorPathItem(*it, "Calling " + (*it)->str()));
+        errorPath.emplace_back(*it, "Calling " + (*it)->str());
     if (!errorPath.empty())
         errorPath.back().second = purefuncname + " is a pure virtual method without body";
 
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -354,9 +354,9 @@ void CheckOther::invalidPointerCast()
                 if (toType->isIntegral() && fromType->isIntegral())
                     continue;
                 std::string toStr = toType->isIntegral() ? "integer *" : toType->str();
-                toStr = toStr.substr(0, toStr.size()-2);
+                toStr.erase(toStr.size()-2);
                 std::string fromStr = fromType->isIntegral() ? "integer *" : fromType->str();
-                fromStr = fromStr.substr(0, fromStr.size() - 2);
+                fromStr.erase(fromStr.size() - 2);
 
                 invalidPointerCastError(tok, fromStr, toStr, toType->type == ValueType::Type::CHAR);
             }
@@ -1829,7 +1829,7 @@ void CheckOther::checkInvalidFree()
 
             // Keep track of which variables were assigned addresses to newly-allocated memory
             if (Token::Match(tok, "%var% = malloc|g_malloc|new")) {
-                allocatedVariables.insert(std::make_pair(tok->varId(), false));
+                allocatedVariables.emplace(tok->varId(), false);
             }
 
             // If a previously-allocated pointer is incremented or decremented, any subsequent
diff --git a/lib/checkstl.cpp b/lib/checkstl.cpp
@@ -1069,16 +1069,16 @@ void CheckStl::string_c_str()
         for (std::list<Scope>::const_iterator scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {
             for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
                 if (c_strFuncParam.erase(func->tokenDef->str()) != 0) { // Check if function with this name was already found
-                    c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), 0)); // Disable, because there are overloads. TODO: Handle overloads
+                    c_strFuncParam.emplace(func->tokenDef->str(), 0); // Disable, because there are overloads. TODO: Handle overloads
                     continue;
                 }
 
                 unsigned int numpar = 0;
-                c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), numpar)); // Insert function as dummy, to indicate that there is at least one function with that name
+                c_strFuncParam.emplace(func->tokenDef->str(), numpar); // Insert function as dummy, to indicate that there is at least one function with that name
                 for (std::list<Variable>::const_iterator var = func->argumentList.cbegin(); var != func->argumentList.cend(); ++var) {
                     numpar++;
                     if (var->isStlStringType() && (!var->isReference() || var->isConst()))
-                        c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), numpar));
+                        c_strFuncParam.emplace(func->tokenDef->str(), numpar);
                 }
             }
         }
diff --git a/lib/checkunusedfunctions.cpp b/lib/checkunusedfunctions.cpp
@@ -68,7 +68,7 @@ void CheckUnusedFunctions::parseTokens(const Tokenizer &tokenizer, const char Fi
         if (tokenizer.isCPP() && func->retDef->str() == "template")
             continue;
 
-        _functionDecl.push_back(FunctionDecl(func));
+        _functionDecl.emplace_back(func);
 
         FunctionUsage &usage = _functions[func->name()];
 
diff --git a/lib/checkunusedvar.cpp b/lib/checkunusedvar.cpp
@@ -247,7 +247,7 @@ void Variables::addVar(const Variable *var,
 {
     if (var->declarationId() > 0) {
         _varAddedInScope.back().insert(var->declarationId());
-        _varUsage.insert(std::make_pair(var->declarationId(), VariableUsage(var, type, false, write_, false)));
+        _varUsage.emplace(var->declarationId(), VariableUsage(var, type, false, write_, false));
     }
 }
 
@@ -382,8 +382,8 @@ Variables::VariableUsage *Variables::find(unsigned int varid)
 
 void Variables::enterScope()
 {
-    _varAddedInScope.push_back(std::set<unsigned int>());
-    _varReadInScope.push_back(std::set<unsigned int>());
+    _varAddedInScope.emplace_back();
+    _varReadInScope.emplace_back();
 }
 
 void Variables::leaveScope(bool insideLoop)
diff --git a/lib/errorlogger.cpp b/lib/errorlogger.cpp
@@ -89,7 +89,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack
         if (!(*it))
             continue;
 
-        _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(*it, list));
+        _callStack.emplace_back(*it, list);
     }
 
     if (list && !list->getFiles().empty())
@@ -108,7 +108,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack
         if (!(*it))
             continue;
 
-        _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(*it, list));
+        _callStack.emplace_back(*it, list);
     }
 
     if (list && !list->getFiles().empty())
@@ -127,7 +127,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenL
 
         // --errorlist can provide null values here
         if (tok)
-            _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(tok, info, tokenList));
+            _callStack.emplace_back(tok, info, tokenList);
     }
 
     if (tokenList && !tokenList->getFiles().empty())
@@ -170,7 +170,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errms
             const char *file = strfile ? strfile : unknown;
             const char *info = strinfo ? strinfo : "";
             const int line = strline ? std::atoi(strline) : 0;
-            _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(file, info, line));
+            _callStack.emplace_back(file, info, line);
         }
     }
 }
@@ -537,7 +537,7 @@ void ErrorLogger::reportUnmatchedSuppressions(const std::list<Suppressions::Supp
 
         std::list<ErrorLogger::ErrorMessage::FileLocation> callStack;
         if (!i->fileName.empty())
-            callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(i->fileName, i->lineNumber));
+            callStack.emplace_back(i->fileName, i->lineNumber);
         reportErr(ErrorLogger::ErrorMessage(callStack, emptyString, Severity::information, "Unmatched suppression: " + i->errorId, "unmatchedSuppression", false));
     }
 }
diff --git a/lib/importproject.cpp b/lib/importproject.cpp
@@ -481,7 +481,7 @@ static void loadVisualStudioProperties(const std::string &props, std::map<std::s
         } else if (std::strcmp(node->Name(),"PropertyGroup")==0) {
             importPropertyGroup(node, variables, includePath, nullptr);
         } else if (std::strcmp(node->Name(),"ItemDefinitionGroup")==0) {
-            itemDefinitionGroupList.push_back(ItemDefinitionGroup(node, additionalIncludeDirectories));
+            itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
         }
     }
 }
@@ -512,7 +512,7 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                     if (std::strcmp(cfg->Name(), "ProjectConfiguration") == 0) {
                         const ProjectConfiguration p(cfg);
                         if (p.platform != ProjectConfiguration::Unknown)
-                            projectConfigurationList.push_back(ProjectConfiguration(cfg));
+                            projectConfigurationList.emplace_back(cfg);
                     }
                 }
             } else {
@@ -525,7 +525,7 @@ void ImportProject::importVcxproj(const std::string &filename, std::map<std::str
                 }
             }
         } else if (std::strcmp(node->Name(), "ItemDefinitionGroup") == 0) {
-            itemDefinitionGroupList.push_back(ItemDefinitionGroup(node, additionalIncludeDirectories));
+            itemDefinitionGroupList.emplace_back(node, additionalIncludeDirectories);
         } else if (std::strcmp(node->Name(), "PropertyGroup") == 0) {
             importPropertyGroup(node, &variables, &includePath, &useOfMfc);
         } else if (std::strcmp(node->Name(), "ImportGroup") == 0) {
diff --git a/lib/library.cpp b/lib/library.cpp
@@ -36,7 +36,7 @@ static std::vector<std::string> getnames(const char *names)
 {
     std::vector<std::string> ret;
     while (const char *p = std::strchr(names,',')) {
-        ret.push_back(std::string(names, p-names));
+        ret.emplace_back(names, p-names);
         names = p + 1;
     }
     ret.push_back(names);
@@ -626,7 +626,7 @@ Library::Error Library::loadFunction(const tinyxml2::XMLElement * const node, co
                         return Error(BAD_ATTRIBUTE_VALUE, argattr);
 
                     ac.minsizes.reserve(type == ArgumentChecks::MinSize::MUL ? 2 : 1);
-                    ac.minsizes.push_back(ArgumentChecks::MinSize(type,argattr[0]-'0'));
+                    ac.minsizes.emplace_back(type,argattr[0]-'0');
                     if (type == ArgumentChecks::MinSize::MUL) {
                         const char *arg2attr = argnode->Attribute("arg2");
                         if (!arg2attr)
diff --git a/lib/preprocessor.cpp b/lib/preprocessor.cpp
@@ -424,13 +424,11 @@ static void getConfigs(const simplecpp::TokenList &tokens, std::set<std::string>
 
 std::set<std::string> Preprocessor::getConfigs(const simplecpp::TokenList &tokens) const
 {
-    std::set<std::string> ret;
-    ret.insert("");
+    std::set<std::string> ret = { "" };
     if (!tokens.cfront())
         return ret;
 
-    std::set<std::string> defined;
-    defined.insert("__cplusplus");
+    std::set<std::string> defined = { "__cplusplus" };
 
     ::getConfigs(tokens, defined, _settings.userDefines, _settings.userUndefs, ret);
 
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
diff --git a/lib/symboldatabase.h b/lib/symboldatabase.h
diff --git a/lib/templatesimplifier.cpp b/lib/templatesimplifier.cpp
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static bool skipAnalysis(const std::string &analyzerInfoFile, unsigned long long`
`90`	`90`
`91`	`91`	`for (const tinyxml2::XMLElement *e = rootNode->FirstChildElement(); e; e = e->NextSiblingElement()) {`
`92`	`92`	`if (std::strcmp(e->Name(), "error") == 0)`
`93`		`- errors->push_back(ErrorLogger::ErrorMessage(e));`
	`93`	`+ errors->emplace_back(e);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -103,14 +103,14 @@ void CheckBufferOverrun::arrayIndexOutOfBoundsError(const Token *tok, const Arra`
`103`	`103`	`std::string nr;`
`104`	`104`	`if (index.size() > 1U)`
`105`	`105`	`nr = "(" + MathLib::toString(i + 1) + getOrdinalText(i + 1) + " array index) ";`
`106`		`- errorPath.push_back(ErrorPathItem(it->first, nr + info));`
	`106`	`+ errorPath.emplace_back(it->first, nr + info);`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`- errorPath.push_back(ErrorPathItem(tok,"Array index out of bounds"));`
	`109`	`+ errorPath.emplace_back(tok,"Array index out of bounds");`
`110`	`110`	`} else {`
`111`		`- errorPath.push_back(ErrorPathItem(tok, "Array index out of bounds"));`
	`111`	`+ errorPath.emplace_back(tok, "Array index out of bounds");`
`112`	`112`	`if (condition)`
`113`		`- errorPath.push_back(ErrorPathItem(condition, "Assuming that condition '" + condition->expressionString() + "' is not redundant"));`
	`113`	`+ errorPath.emplace_back(condition, "Assuming that condition '" + condition->expressionString() + "' is not redundant");`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`if (condition != nullptr) {`
Original file line number	Diff line number	Diff line change
`@@ -1069,16 +1069,16 @@ void CheckStl::string_c_str()`
`1069`	`1069`	`for (std::list<Scope>::const_iterator scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {`
`1070`	`1070`	`for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {`
`1071`	`1071`	`if (c_strFuncParam.erase(func->tokenDef->str()) != 0) { // Check if function with this name was already found`
`1072`		`- c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), 0)); // Disable, because there are overloads. TODO: Handle overloads`
	`1072`	`+ c_strFuncParam.emplace(func->tokenDef->str(), 0); // Disable, because there are overloads. TODO: Handle overloads`
`1073`	`1073`	`continue;`
`1074`	`1074`	`}`
`1075`	`1075`
`1076`	`1076`	`unsigned int numpar = 0;`
`1077`		`- c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), numpar)); // Insert function as dummy, to indicate that there is at least one function with that name`
	`1077`	`+ c_strFuncParam.emplace(func->tokenDef->str(), numpar); // Insert function as dummy, to indicate that there is at least one function with that name`
`1078`	`1078`	`for (std::list<Variable>::const_iterator var = func->argumentList.cbegin(); var != func->argumentList.cend(); ++var) {`
`1079`	`1079`	`numpar++;`
`1080`	`1080`	`if (var->isStlStringType() && (!var->isReference() \|\| var->isConst()))`
`1081`		`- c_strFuncParam.insert(std::make_pair(func->tokenDef->str(), numpar));`
	`1081`	`+ c_strFuncParam.emplace(func->tokenDef->str(), numpar);`
`1082`	`1082`	`}`
`1083`	`1083`	`}`
`1084`	`1084`	`}`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ void Variables::addVar(const Variable *var,`
`247`	`247`	`{`
`248`	`248`	`if (var->declarationId() > 0) {`
`249`	`249`	`_varAddedInScope.back().insert(var->declarationId());`
`250`		`- _varUsage.insert(std::make_pair(var->declarationId(), VariableUsage(var, type, false, write_, false)));`
	`250`	`+ _varUsage.emplace(var->declarationId(), VariableUsage(var, type, false, write_, false));`
`251`	`251`	`}`
`252`	`252`	`}`
`253`	`253`
`@@ -382,8 +382,8 @@ Variables::VariableUsage *Variables::find(unsigned int varid)`
`382`	`382`
`383`	`383`	`void Variables::enterScope()`
`384`	`384`	`{`
`385`		`- _varAddedInScope.push_back(std::set<unsigned int>());`
`386`		`- _varReadInScope.push_back(std::set<unsigned int>());`
	`385`	`+ _varAddedInScope.emplace_back();`
	`386`	`+ _varReadInScope.emplace_back();`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`void Variables::leaveScope(bool insideLoop)`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack`
`89`	`89`	`if (!(*it))`
`90`	`90`	`continue;`
`91`	`91`
`92`		`- _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(*it, list));`
	`92`	`+ _callStack.emplace_back(*it, list);`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`if (list && !list->getFiles().empty())`
`@@ -108,7 +108,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const std::list<const Token*>& callstack`
`108`	`108`	`if (!(*it))`
`109`	`109`	`continue;`
`110`	`110`
`111`		`- _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(*it, list));`
	`111`	`+ _callStack.emplace_back(*it, list);`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`if (list && !list->getFiles().empty())`
`@@ -127,7 +127,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const ErrorPath &errorPath, const TokenL`
`127`	`127`
`128`	`128`	`// --errorlist can provide null values here`
`129`	`129`	`if (tok)`
`130`		`- _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(tok, info, tokenList));`
	`130`	`+ _callStack.emplace_back(tok, info, tokenList);`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if (tokenList && !tokenList->getFiles().empty())`
`@@ -170,7 +170,7 @@ ErrorLogger::ErrorMessage::ErrorMessage(const tinyxml2::XMLElement * const errms`
`170`	`170`	`const char *file = strfile ? strfile : unknown;`
`171`	`171`	`const char *info = strinfo ? strinfo : "";`
`172`	`172`	`const int line = strline ? std::atoi(strline) : 0;`
`173`		`- _callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(file, info, line));`
	`173`	`+ _callStack.emplace_back(file, info, line);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`	`}`
`@@ -537,7 +537,7 @@ void ErrorLogger::reportUnmatchedSuppressions(const std::list<Suppressions::Supp`
`537`	`537`
`538`	`538`	`std::list<ErrorLogger::ErrorMessage::FileLocation> callStack;`
`539`	`539`	`if (!i->fileName.empty())`
`540`		`- callStack.push_back(ErrorLogger::ErrorMessage::FileLocation(i->fileName, i->lineNumber));`
	`540`	`+ callStack.emplace_back(i->fileName, i->lineNumber);`
`541`	`541`	`reportErr(ErrorLogger::ErrorMessage(callStack, emptyString, Severity::information, "Unmatched suppression: " + i->errorId, "unmatchedSuppression", false));`
`542`	`542`	`}`
`543`	`543`	`}`