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

Merge pull request #742 from Dmitry-Me/reduceScopeBetterName 

Reduce variable scope, better name
This commit is contained in:
orbitcowboy 2015-12-24 15:48:39 +01:00
parent 940d569980 458f0da197
commit e8b2b5e934
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/checkclass.cpp
View File

@ -1876,11 +1876,12 @@ bool CheckClass::checkConstFunc(const Scope *scope, const Function *func, bool&
if (lhs->astParent()->strAt(1) != "const") if (lhs->astParent()->strAt(1) != "const")
return false; return false;
} else { } else {
const Variable* v2 = lhs->previous()->variable(); if (lhs->tokType() == Token::eAssignmentOp) {
if (lhs->tokType() == Token::eAssignmentOp && v2) const Variable* lhsVar = lhs->previous()->variable();
if (!v2->isConst() && v2->isReference() && lhs == v2->nameToken()->next()) if (lhsVar && !lhsVar->isConst() && lhsVar->isReference() && lhs == lhsVar->nameToken()->next())
return false; return false;
} }
}
const Token* jumpBackToken = nullptr; const Token* jumpBackToken = nullptr;
const Token *lastVarTok = tok1; const Token *lastVarTok = tok1;