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

Merge pull request #406 from Dmitry-Me/removeCodeDuplicationCleanupVariableNames 

Reduce code duplication, cleanup variable names
This commit is contained in:
PKEuS 2014-08-26 10:42:22 +02:00
parent 2326e78381 d72b98bbaa
commit c15ead7855
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/checkbool.cpp
View File

@ -202,6 +202,17 @@ void CheckBool::comparisonOfBoolWithInvalidComparator(const Token *tok, const st
// Comparing functions which are returning value of type bool // Comparing functions which are returning value of type bool
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
static bool tokenIsFunctionReturningBool(const Token* tok)
{
if (Token::Match(tok, "%var% (") && !Token::Match(tok->previous(), "::|.")) {
const Function* func = tok->function();
if (func && func->tokenDef && func->tokenDef->strAt(-1) == "bool") {
return true;
}
}
return false;
}
void CheckBool::checkComparisonOfFuncReturningBool() void CheckBool::checkComparisonOfFuncReturningBool()
{ {
if (!_settings->isEnabled("style")) if (!_settings->isEnabled("style"))
@ -212,42 +223,28 @@ void CheckBool::checkComparisonOfFuncReturningBool()
const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase(); const SymbolDatabase * const symbolDatabase = _tokenizer->getSymbolDatabase();
const std::size_t functions = symbolDatabase->functionScopes.size(); const std::size_t functionsCount = symbolDatabase->functionScopes.size();
for (std::size_t i = 0; i < functions; ++i) { for (std::size_t i = 0; i < functionsCount; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i]; const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) { for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
if (tok->type() != Token::eComparisonOp || tok->str() == "==" || tok->str() == "!=") if (tok->type() != Token::eComparisonOp || tok->str() == "==" || tok->str() == "!=")
continue; continue;
const Token *first_token = tok->previous(); const Token *firstToken = tok->previous();
if (tok->strAt(-1) == ")") { if (tok->strAt(-1) == ")") {
first_token = first_token->link()->previous(); firstToken = firstToken->link()->previous();
} }
bool first_token_func_of_type_bool = false; const Token *secondToken = tok->next();
if (Token::Match(first_token, "%var% (") && !Token::Match(first_token->previous(), "::|.")) { while (secondToken->str() == "!") {
const Function* func = first_token->function(); secondToken = secondToken->next();
if (func && func->tokenDef && func->tokenDef->strAt(-1) == "bool") {
first_token_func_of_type_bool = true;
}
} }
const bool firstIsFunctionReturningBool = tokenIsFunctionReturningBool(firstToken);
Token *second_token = tok->next(); const bool secondIsFunctionReturningBool = tokenIsFunctionReturningBool(secondToken);
while (second_token->str()=="!") { if (firstIsFunctionReturningBool && secondIsFunctionReturningBool) {
second_token = second_token->next(); comparisonOfTwoFuncsReturningBoolError(firstToken->next(), firstToken->str(), secondToken->str());
} } else if (firstIsFunctionReturningBool) {
bool second_token_func_of_type_bool = false; comparisonOfFuncReturningBoolError(firstToken->next(), firstToken->str());
if (Token::Match(second_token, "%var% (") && !Token::Match(second_token->previous(), "::|.")) { } else if (secondIsFunctionReturningBool) {
const Function* func = second_token->function(); comparisonOfFuncReturningBoolError(secondToken->previous(), secondToken->str());
if (func && func->tokenDef && func->tokenDef->strAt(-1) == "bool") {
second_token_func_of_type_bool = true;
}
}
if ((first_token_func_of_type_bool == true) && (second_token_func_of_type_bool == true)) {
comparisonOfTwoFuncsReturningBoolError(first_token->next(), first_token->str(), second_token->str());
} else if (first_token_func_of_type_bool == true) {
comparisonOfFuncReturningBoolError(first_token->next(), first_token->str());
} else if (second_token_func_of_type_bool == true) {
comparisonOfFuncReturningBoolError(second_token->previous(), second_token->str());
} }
} }
} }