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

Refactoring; use range for loop

This commit is contained in:
Daniel Marjamäki 2018-04-24 11:04:47 +02:00
parent 5e31911fcd
commit 22963f3ed8
1 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
lib/checkclass.cpp
View File

@ -86,17 +86,14 @@ void CheckClass::constructors()
return; return;
const bool printInconclusive = _settings->inconclusive; const bool printInconclusive = _settings->inconclusive;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
bool usedInUnion = false; bool usedInUnion = false;
for (std::list<Scope>::const_iterator it = symbolDatabase->scopeList.begin(); it != symbolDatabase->scopeList.end(); ++it) { for (const Scope &unionScope : symbolDatabase->scopeList) {
if (it->type != Scope::eUnion) if (unionScope.type != Scope::eUnion)
continue; continue;
const Scope &unionScope = *it; for (const Variable &var : unionScope.varlist) {
for (std::list<Variable>::const_iterator var = unionScope.varlist.begin(); var != unionScope.varlist.end(); ++var) { if (var.type() && var.type()->classScope == scope) {
if (var->type() && var->type()->classScope == scope) {
usedInUnion = true; usedInUnion = true;
break; break;
} }
@ -106,10 +103,9 @@ void CheckClass::constructors()
// There are no constructors. // There are no constructors.
if (scope->numConstructors == 0 && printStyle && !usedInUnion) { if (scope->numConstructors == 0 && printStyle && !usedInUnion) {
// If there is a private variable, there should be a constructor.. // If there is a private variable, there should be a constructor..
std::list<Variable>::const_iterator var; for (const Variable &var : scope->varlist) {
for (var = scope->varlist.begin(); var != scope->varlist.end(); ++var) { if (var.isPrivate() && !var.isStatic() && !Token::Match(var.nameToken(), "%varid% ; %varid% =", var.declarationId()) &&
if (var->isPrivate() && !var->isStatic() && !Token::Match(var->nameToken(), "%varid% ; %varid% =", var->declarationId()) && (!var.isClass() || (var.type() && var.type()->needInitialization == Type::True))) {
(!var->isClass() || (var->type() && var->type()->needInitialization == Type::True))) {
noConstructorError(scope->classDef, scope->className, scope->classDef->str() == "struct"); noConstructorError(scope->classDef, scope->className, scope->classDef->str() == "struct");
break; break;
} }
@ -123,8 +119,7 @@ void CheckClass::constructors()
// TODO: handle union variables better // TODO: handle union variables better
{ {
bool bailout = false; bool bailout = false;
for (std::list<Scope *>::const_iterator it = scope->nestedList.begin(); it != scope->nestedList.end(); ++it) { for (const Scope * const nestedScope : scope->nestedList) {
const Scope * const nestedScope = *it;
if (nestedScope->type == Scope::eUnion) { if (nestedScope->type == Scope::eUnion) {
bailout = true; bailout = true;
break; break;
@ -240,10 +235,7 @@ void CheckClass::checkExplicitConstructors()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
// Do not perform check, if the class/struct has not any constructors // Do not perform check, if the class/struct has not any constructors
if (scope->numConstructors == 0) if (scope->numConstructors == 0)
continue; continue;
@ -251,8 +243,8 @@ void CheckClass::checkExplicitConstructors()
// Is class abstract? Maybe this test is over-simplification, but it will suffice for simple cases, // Is class abstract? Maybe this test is over-simplification, but it will suffice for simple cases,
// and it will avoid false positives. // and it will avoid false positives.
bool isAbstractClass = false; bool isAbstractClass = false;
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (const Function &func : scope->functionList) {
if (func->isPure()) { if (func.isPure()) {
isAbstractClass = true; isAbstractClass = true;
break; break;
} }
@ -263,21 +255,21 @@ void CheckClass::checkExplicitConstructors()
if (isAbstractClass && _settings->standards.cpp != Standards::CPP11) if (isAbstractClass && _settings->standards.cpp != Standards::CPP11)
continue; continue;
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (const Function &func : scope->functionList) {
// We are looking for constructors, which are meeting following criteria: // We are looking for constructors, which are meeting following criteria:
// 1) Constructor is declared with a single parameter // 1) Constructor is declared with a single parameter
// 2) Constructor is not declared as explicit // 2) Constructor is not declared as explicit
// 3) It is not a copy/move constructor of non-abstract class // 3) It is not a copy/move constructor of non-abstract class
// 4) Constructor is not marked as delete (programmer can mark the default constructor as deleted, which is ok) // 4) Constructor is not marked as delete (programmer can mark the default constructor as deleted, which is ok)
if (!func->isConstructor() || func->isDelete() || (!func->hasBody() && func->access == Private)) if (!func.isConstructor() || func.isDelete() || (!func.hasBody() && func.access == Private))
continue; continue;
if (!func->isExplicit() && if (!func.isExplicit() &&
func->argCount() == 1 && func.argCount() == 1 &&
func->type != Function::eCopyConstructor && func.type != Function::eCopyConstructor &&
func->type != Function::eMoveConstructor) { func.type != Function::eMoveConstructor) {
noExplicitConstructorError(func->tokenDef, scope->className, scope->type == Scope::eStruct); noExplicitConstructorError(func.tokenDef, scope->className, scope->type == Scope::eStruct);
} }
} }
} }
@ -288,9 +280,7 @@ void CheckClass::copyconstructors()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
std::map<unsigned int, const Token*> allocatedVars; std::map<unsigned int, const Token*> allocatedVars;
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
@ -949,9 +939,7 @@ void CheckClass::privateFunctions()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
// do not check borland classes with properties.. // do not check borland classes with properties..
if (Token::findsimplematch(scope->classStart, "; __property ;", scope->classEnd)) if (Token::findsimplematch(scope->classStart, "; __property ;", scope->classEnd))
@ -1211,10 +1199,7 @@ void CheckClass::operatorEq()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
if (func->type == Function::eOperatorEqual && func->access == Public) { if (func->type == Function::eOperatorEqual && func->access == Public) {
// skip "deleted" functions - cannot be called anyway // skip "deleted" functions - cannot be called anyway
@ -1267,10 +1252,7 @@ void CheckClass::operatorEqRetRefThis()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
if (func->type == Function::eOperatorEqual && func->hasBody()) { if (func->type == Function::eOperatorEqual && func->hasBody()) {
// make sure return signature is correct // make sure return signature is correct
@ -1401,9 +1383,7 @@ void CheckClass::operatorEqToSelf()
if (!_settings->isEnabled(Settings::WARNING)) if (!_settings->isEnabled(Settings::WARNING))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
// skip classes with multiple inheritance // skip classes with multiple inheritance
if (scope->definedType->derivedFrom.size() > 1) if (scope->definedType->derivedFrom.size() > 1)
continue; continue;
@ -1527,9 +1507,7 @@ void CheckClass::virtualDestructor()
std::list<const Function *> inconclusiveErrors; std::list<const Function *> inconclusiveErrors;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
// Skip base classes (unless inconclusive) // Skip base classes (unless inconclusive)
if (scope->definedType->derivedFrom.empty()) { if (scope->definedType->derivedFrom.empty()) {
@ -1706,10 +1684,7 @@ void CheckClass::checkConst()
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
// does the function have a body? // does the function have a body?
if (func->type != Function::eFunction || !func->hasBody()) if (func->type != Function::eFunction || !func->hasBody())
@ -2092,9 +2067,7 @@ void CheckClass::initializerListOrder()
if (!_settings->inconclusive) if (!_settings->inconclusive)
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
// iterate through all member functions looking for constructors // iterate through all member functions looking for constructors
for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) { for (std::list<Function>::const_iterator func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
@ -2410,9 +2383,7 @@ void CheckClass::checkCopyCtorAndEqOperator()
if (!_settings->isEnabled(Settings::WARNING)) if (!_settings->isEnabled(Settings::WARNING))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * scope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * scope = symbolDatabase->classAndStructScopes[i];
bool hasNonStaticVars = false; bool hasNonStaticVars = false;
for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var) { for (std::list<Variable>::const_iterator var = scope->varlist.begin(); var != scope->varlist.end(); ++var) {
@ -2472,9 +2443,7 @@ void CheckClass::checkUnsafeClassDivZero(bool test)
if (!_settings->isEnabled(Settings::STYLE)) if (!_settings->isEnabled(Settings::STYLE))
return; return;
const std::size_t classes = symbolDatabase->classAndStructScopes.size(); for (const Scope * classScope : symbolDatabase->classAndStructScopes) {
for (std::size_t i = 0; i < classes; ++i) {
const Scope * classScope = symbolDatabase->classAndStructScopes[i];
if (!test && classScope->classDef->fileIndex() != 1) if (!test && classScope->classDef->fileIndex() != 1)
continue; continue;
std::list<Function>::const_iterator func; std::list<Function>::const_iterator func;