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

Better variable name

This commit is contained in:
Dmitry-Me 2015-03-23 11:58:56 +03:00
parent 19f770e41b
commit 0383998aea
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/checkclass.cpp
View File

@ -2005,11 +2005,11 @@ void CheckClass::initializerListOrder()
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) {
const Scope * info = symbolDatabase->classAndStructScopes[i]; const Scope * scope = symbolDatabase->classAndStructScopes[i];
std::list<Function>::const_iterator func; std::list<Function>::const_iterator func;
// iterate through all member functions looking for constructors // iterate through all member functions looking for constructors
for (func = info->functionList.begin(); func != info->functionList.end(); ++func) { for (func = scope->functionList.begin(); func != scope->functionList.end(); ++func) {
if ((func->isConstructor()) && func->hasBody()) { if ((func->isConstructor()) && func->hasBody()) {
// check for initializer list // check for initializer list
const Token *tok = func->arg->link()->next(); const Token *tok = func->arg->link()->next();
@ -2021,13 +2021,12 @@ void CheckClass::initializerListOrder()
// find all variable initializations in list // find all variable initializations in list
while (tok && tok != func->functionScope->classStart) { while (tok && tok != func->functionScope->classStart) {
if (Token::Match(tok, "%name% (|{")) { if (Token::Match(tok, "%name% (|{")) {
const Variable *var = info->getVariable(tok->str()); const Variable *var = scope->getVariable(tok->str());
if (var) if (var)
vars.push_back(VarInfo(var, tok)); vars.push_back(VarInfo(var, tok));
if (Token::Match(tok->tokAt(2), "%name% =")) { if (Token::Match(tok->tokAt(2), "%name% =")) {
var = info->getVariable(tok->strAt(2)); var = scope->getVariable(tok->strAt(2));
if (var) if (var)
vars.push_back(VarInfo(var, tok->tokAt(2))); vars.push_back(VarInfo(var, tok->tokAt(2)));
@ -2041,7 +2040,7 @@ void CheckClass::initializerListOrder()
for (std::size_t j = 1; j < vars.size(); j++) { for (std::size_t j = 1; j < vars.size(); j++) {
// check for out of order initialization // check for out of order initialization
if (vars[j].var->index() < vars[j - 1].var->index()) if (vars[j].var->index() < vars[j - 1].var->index())
initializerListError(vars[j].tok,vars[j].var->nameToken(), info->className, vars[j].var->name()); initializerListError(vars[j].tok,vars[j].var->nameToken(), scope->className, vars[j].var->name());
} }
} }
} }