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

Tokenizer::setVarIdNew: Fixed varidclass9

This commit is contained in:
Daniel Marjamäki 2012-04-21 13:39:43 +02:00
parent 85b470c41b
commit 6071a5afc3
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -2854,8 +2854,13 @@ static void setVarIdClassDeclaration(Token * const startToken, const std::map<st
const Token * const endToken = startToken->link();
// replace varids..
for (Token *tok = startToken; tok != endToken; tok = tok->next()) {
if (tok->isName() && tok->varId() <= scopeStartVarId) {
unsigned int indentlevel = 0;
for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) {
if (tok->str() == "{")
++indentlevel;
else if (tok->str() == "}")
--indentlevel;
else if (indentlevel > 0 && tok->isName() && tok->varId() <= scopeStartVarId) {
if (tok->previous()->str() == "::" || tok->next()->str() == "::")
continue;
const std::map<std::string, unsigned int>::const_iterator it = variableId.find(tok->str());
@ -2945,7 +2950,7 @@ void Tokenizer::setVarIdNew()
else if (decl && Token::Match(tok2->previous(), "%type% ( !!)")) {
const Token *tok3 = tok2->next();
if (!setVarIdParseDeclaration(&tok3,variableId,executableScope.top())) {
if (!tok3->isStandardType() && !setVarIdParseDeclaration(&tok3,variableId,executableScope.top())) {
variableId[tok2->previous()->str()] = ++_varId;
tok = tok2->previous();
}