walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Auto variables: Speedup my fix. Use the symbol database instead of Token::findmatch.

This commit is contained in:
Daniel Marjamäki 2012-07-19 16:42:56 +02:00
parent 4312d31b87
commit 9352e124fe
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/checkautovariables.cpp
View File

@ -231,9 +231,31 @@ bool CheckAutoVariables::returnTemporary(const Token *tok) const
{
if (!Token::Match(tok, "return %var% ("))
return false;
// TODO: Find all functions that return objects by value
return bool(NULL != Token::findmatch(_tokenizer->tokens(), ("std :: string " + tok->next()->str() + " (").c_str()) &&
NULL == Token::findmatch(_tokenizer->tokens(), ("std :: string & " + tok->next()->str() + " (").c_str()));
const std::string &funcname(tok->next()->str());
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
std::list<Scope>::const_iterator scope;
bool retref = false; // is there such a function that returns a reference?
bool retvalue = false; // is there such a function that returns a value?
for (scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {
if (scope->type == Scope::eFunction) {
if (scope->classDef->str() == funcname) {
const Token *tok2 = scope->classDef;
while (tok2 && Token::Match(tok2->tokAt(-2), "%type% ::"))
tok2 = tok2->tokAt(-2);
if (tok2 && Token::simpleMatch(tok2->tokAt(-3), "std :: string"))
retvalue = true;
else if (tok2 && Token::simpleMatch(tok2->tokAt(-4), "std :: string &"))
retref = true;
}
}
}
return bool(!retref && retvalue);
}
//---------------------------------------------------------------------------