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

Move variable declarations, remove unneeded assignments, remove comparison duplication

This commit is contained in:
Dmitry-Me 2014-09-19 11:29:31 +04:00
parent 77f341be97
commit ebf1764bcc
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/symboldatabase.cpp
View File

@ -1541,8 +1541,9 @@ void SymbolDatabase::addClassFunction(Scope **scope, const Token **tok, const To
} else if (func->type != Function::eDestructor && !destructor) {
// normal function?
if ((*tok)->next()->link()) {
if ((func->isConst && (*tok)->next()->link()->next()->str() == "const") ||
(!func->isConst && (*tok)->next()->link()->next()->str() != "const")) {
const bool hasConstKeyword = (*tok)->next()->link()->next()->str() == "const";
if ((func->isConst && hasConstKeyword) ||
(!func->isConst && !hasConstKeyword)) {
func->hasBody = true;
}
}
@ -1620,16 +1621,14 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
// check for base classes
else if (Token::Match(tok2, ":|,")) {
Type::BaseInfo base;
base.isVirtual = false;
tok2 = tok2->next();
// check for invalid code
if (!tok2 || !tok2->next())
return nullptr;
Type::BaseInfo base;
if (tok2->str() == "virtual") {
base.isVirtual = true;
tok2 = tok2->next();
@ -1669,7 +1668,6 @@ const Token *Type::initBaseInfo(const Token *tok, const Token *tok1)
}
base.name = tok2->str();
base.type = nullptr;
// add unhandled templates
if (tok2->next() && tok2->next()->str() == "<") {
@ -2188,13 +2186,13 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
unsigned int count = 0;
for (const Token* tok = start->next(); tok; tok = tok->next()) {
if (Token::Match(tok, ",|)"))
return; // Syntax error
const Token* startTok = tok;
const Token* endTok = nullptr;
const Token* nameTok = nullptr;
if (Token::Match(tok, ",|)"))
return; // Syntax error
do {
if (tok->varId() != 0) {
nameTok = tok;
@ -2572,10 +2570,6 @@ void Scope::getVariableList()
const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
{
// This is the start of a statement
const Token *vartok = nullptr;
const Token *typetok = nullptr;
// Is it a throw..?
if (Token::Match(tok, "throw %any% (") &&
Token::simpleMatch(tok->linkAt(2), ") ;")) {
@ -2605,6 +2599,10 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess)
tok = tok->next();
}
// This is the start of a statement
const Token *vartok = nullptr;
const Token *typetok = nullptr;
if (tok && isVariableDeclaration(tok, vartok, typetok)) {
// If the vartok was set in the if-blocks above, create a entry for this variable..
tok = vartok->next();