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

Cleanup variable names, omit redundant actions

This commit is contained in:
Dmitry-Me 2016-01-11 13:04:52 +03:00
parent f8306383b1
commit 499e15d96a
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/checkclass.cpp
View File

@ -1486,7 +1486,7 @@ void CheckClass::virtualDestructor()
// * base class has virtual members but doesn't have virtual destructor // * base class has virtual members but doesn't have virtual destructor
const bool printInconclusive = _settings->inconclusive; const bool printInconclusive = _settings->inconclusive;
std::list<const Function *> inconclusive_errors; std::list<const Function *> inconclusiveErrors;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); const std::size_t classes = symbolDatabase->classAndStructScopes.size();
for (std::size_t i = 0; i < classes; ++i) { for (std::size_t i = 0; i < classes; ++i) {
@ -1500,7 +1500,7 @@ void CheckClass::virtualDestructor()
std::list<Function>::const_iterator func; std::list<Function>::const_iterator func;
for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
if (func->isVirtual()) { if (func->isVirtual()) {
inconclusive_errors.push_back(destructor); inconclusiveErrors.push_back(destructor);
break; break;
} }
} }
@ -1539,12 +1539,12 @@ void CheckClass::virtualDestructor()
// If this pattern is not seen then bailout the checking of these base/derived classes // If this pattern is not seen then bailout the checking of these base/derived classes
{ {
// pointer variables of type 'Base *' // pointer variables of type 'Base *'
std::set<unsigned int> basepointer; std::set<unsigned int> baseClassPointers;
for (std::size_t k = 1; k < symbolDatabase->getVariableListSize(); k++) { for (std::size_t k = 1; k < symbolDatabase->getVariableListSize(); k++) {
const Variable* var = symbolDatabase->getVariableFromVarId(k); const Variable* var = symbolDatabase->getVariableFromVarId(k);
if (var && var->isPointer() && var->type() == derivedFrom) if (var && var->isPointer() && var->type() == derivedFrom)
basepointer.insert(var->declarationId()); baseClassPointers.insert(var->declarationId());
} }
// pointer variables of type 'Base *' that should not be deleted // pointer variables of type 'Base *' that should not be deleted
@ -1555,7 +1555,7 @@ void CheckClass::virtualDestructor()
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) { for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next()) {
if (Token::Match(tok, "[;{}] %var% =") && if (Token::Match(tok, "[;{}] %var% =") &&
basepointer.find(tok->next()->varId()) != basepointer.end()) { baseClassPointers.find(tok->next()->varId()) != baseClassPointers.end()) {
// new derived class.. // new derived class..
if (Token::simpleMatch(tok->tokAt(3), ("new " + derivedClass->str()).c_str())) { if (Token::simpleMatch(tok->tokAt(3), ("new " + derivedClass->str()).c_str())) {
dontDelete.insert(tok->next()->varId()); dontDelete.insert(tok->next()->varId());
@ -1576,21 +1576,14 @@ void CheckClass::virtualDestructor()
} }
// Find the destructor declaration for the base class. // Find the destructor declaration for the base class.
const Function *base_destructor = derivedFromScope->getDestructor(); const Function *baseDestructor = derivedFromScope->getDestructor();
const Token *base = nullptr;
if (base_destructor)
base = base_destructor->token;
// Check that there is a destructor.. // Check that there is a destructor..
if (!base_destructor) { if (!baseDestructor) {
if (derivedFrom->derivedFrom.empty()) { if (derivedFrom->derivedFrom.empty()) {
virtualDestructorError(derivedFrom->classDef, derivedFrom->name(), derivedClass->str(), false); virtualDestructorError(derivedFrom->classDef, derivedFrom->name(), derivedClass->str(), false);
// check for duplicate error and remove if if found
std::list<const Function *>::iterator found = find(inconclusive_errors.begin(), inconclusive_errors.end(), base_destructor);
if (found != inconclusive_errors.end())
inconclusive_errors.erase(found);
} }
} else if (!base_destructor->isVirtual()) { } else if (!baseDestructor->isVirtual()) {
// TODO: This is just a temporary fix, better solution is needed. // TODO: This is just a temporary fix, better solution is needed.
// Skip situations where base class has base classes of its own, because // Skip situations where base class has base classes of its own, because
// some of the base classes might have virtual destructor. // some of the base classes might have virtual destructor.
@ -1601,12 +1594,12 @@ void CheckClass::virtualDestructor()
// Make sure that the destructor is public (protected or private // Make sure that the destructor is public (protected or private
// would not compile if inheritance is used in a way that would // would not compile if inheritance is used in a way that would
// cause the bug we are trying to find here.) // cause the bug we are trying to find here.)
if (base_destructor->access == Public) { if (baseDestructor->access == Public) {
virtualDestructorError(base, derivedFrom->name(), derivedClass->str(), false); virtualDestructorError(baseDestructor->token, derivedFrom->name(), derivedClass->str(), false);
// check for duplicate error and remove if if found // check for duplicate error and remove it if found
std::list<const Function *>::iterator found = find(inconclusive_errors.begin(), inconclusive_errors.end(), base_destructor); std::list<const Function *>::iterator found = find(inconclusiveErrors.begin(), inconclusiveErrors.end(), baseDestructor);
if (found != inconclusive_errors.end()) if (found != inconclusiveErrors.end())
inconclusive_errors.erase(found); inconclusiveErrors.erase(found);
} }
} }
} }
@ -1614,7 +1607,7 @@ void CheckClass::virtualDestructor()
} }
} }
for (std::list<const Function *>::const_iterator i = inconclusive_errors.begin(); i != inconclusive_errors.end(); ++i) for (std::list<const Function *>::const_iterator i = inconclusiveErrors.begin(); i != inconclusiveErrors.end(); ++i)
virtualDestructorError((*i)->tokenDef, (*i)->name(), "", true); virtualDestructorError((*i)->tokenDef, (*i)->name(), "", true);
} }