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

Simplified code

This commit is contained in:
PKEuS 2014-09-11 16:55:00 +02:00
parent fb0d145b34
commit c1b0bfe4ee
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/checkbool.cpp
View File

@ -46,13 +46,10 @@ void CheckBool::checkIncrementBoolean()
for (std::size_t i = 0; i < functions; ++i) {
const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart->next(); tok != scope->classEnd; tok = tok->next()) {
if (Token::Match(tok, "%var% ++")) {
if (tok->varId()) {
const Variable *var = tok->variable();
if (var && var->typeEndToken()->str() == "bool")
incrementBooleanError(tok);
}
if (tok->variable() && Token::Match(tok, "%var% ++")) {
const Variable *var = tok->variable();
if (var && var->typeEndToken()->str() == "bool")
incrementBooleanError(tok);
}
}
}
@ -204,9 +201,9 @@ void CheckBool::comparisonOfBoolWithInvalidComparator(const Token *tok, const st
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") {
const Function* func = tok->function();
if (func && Token::Match(tok, "%var% (")) {
if (func->tokenDef && func->tokenDef->strAt(-1) == "bool") {
return true;
}
}
@ -483,7 +480,7 @@ void CheckBool::checkAssignBoolToFloat()
const Scope * scope = symbolDatabase->functionScopes[i];
for (const Token* tok = scope->classStart; tok != scope->classEnd; tok = tok->next()) {
if (Token::Match(tok, "%var% =")) {
const Variable * const var = symbolDatabase->getVariableFromVarId(tok->varId());
const Variable * const var = tok->variable();
if (var && var->isFloatingType() && !var->isArrayOrPointer() && astIsBool(tok->next()->astOperand2()))
assignBoolToFloatError(tok->next());
}

4
lib/checkexceptionsafety.cpp
View File

@ -53,13 +53,13 @@ void CheckExceptionSafety::destructors()
}
// Skip uncaught execptions
if (Token::simpleMatch(tok, "if ( ! std :: uncaught_exception ( ) ) {")) {
else if (Token::simpleMatch(tok, "if ( ! std :: uncaught_exception ( ) ) {")) {
tok = tok->next()->link(); // end of if ( ... )
tok = tok->next()->link(); // end of { ... }
}
// throw found within a destructor
if (tok->str() == "throw") {
else if (tok->str() == "throw") {
destructorsError(tok, scope->className);
break;
}

2
lib/checkother.cpp
View File

@ -1368,7 +1368,7 @@ void CheckOther::checkVariableScope()
for (unsigned int i = 1; i < symbolDatabase->getVariableListSize(); i++) {
const Variable* var = symbolDatabase->getVariableFromVarId(i);
if (!var || !var->isLocal() || (!var->isPointer() && !var->typeStartToken()->isStandardType() && !var->typeStartToken()->next()->isStandardType()))
if (!var || !var->isLocal() || (!var->isPointer() && !var->typeStartToken()->isStandardType()))
continue;
if (var->isConst())