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

Fixed #8272 (setVarIdPass2: Broken parsing of class header)

This commit is contained in:
Daniel Marjamäki 2017-11-11 12:04:25 +01:00
parent 4740bf116f
commit 31a1cebc5f
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
lib/tokenize.cpp
View File

@ -3044,37 +3044,41 @@ void Tokenizer::setVarIdPass2()
for (std::list<const Token *>::const_iterator it = classnameTokens.begin(); it != classnameTokens.end(); ++it) for (std::list<const Token *>::const_iterator it = classnameTokens.begin(); it != classnameTokens.end(); ++it)
classname += (classname.empty() ? "" : " :: ") + (*it)->str(); classname += (classname.empty() ? "" : " :: ") + (*it)->str();
std::map<std::string, unsigned int>& thisClassVars = varsByClass[scopeName2 + classname]; std::map<std::string, unsigned int> &thisClassVars = varsByClass[scopeName2 + classname];
while (tokStart && tokStart->str() != "{") { while (Token::Match(tokStart, ":|::|,|%name%")) {
if (Token::Match(tokStart, "public|private|protected %name%")) if (Token::Match(tokStart, "%name% <")) {
tokStart = tokStart->next(); tokStart = tokStart->next()->findClosingBracket();
if (tokStart->strAt(1) == "," || tokStart->strAt(1) == "{") { if (tokStart)
tokStart = tokStart->next();
continue;
}
if (Token::Match(tokStart, "%name% ,|{")) {
const std::map<std::string, unsigned int>& baseClassVars = varsByClass[tokStart->str()]; const std::map<std::string, unsigned int>& baseClassVars = varsByClass[tokStart->str()];
thisClassVars.insert(baseClassVars.begin(), baseClassVars.end()); thisClassVars.insert(baseClassVars.begin(), baseClassVars.end());
} }
tokStart = tokStart->next(); tokStart = tokStart->next();
} }
if (!Token::simpleMatch(tokStart, "{"))
continue;
// What member variables are there in this class? // What member variables are there in this class?
if (tokStart) { for (std::list<const Token *>::const_iterator it = classnameTokens.begin(); it != classnameTokens.end(); ++it)
for (std::list<const Token *>::const_iterator it = classnameTokens.begin(); it != classnameTokens.end(); ++it) scopeInfo.push_back(ScopeInfo2((*it)->str(), tokStart->link()));
scopeInfo.push_back(ScopeInfo2((*it)->str(), tokStart->link()));
for (Token *tok2 = tokStart->next(); tok2 && tok2 != tokStart->link(); tok2 = tok2->next()) { for (Token *tok2 = tokStart->next(); tok2 && tok2 != tokStart->link(); tok2 = tok2->next()) {
// skip parentheses.. // skip parentheses..
if (tok2->link()) { if (tok2->link()) {
if (tok2->str() == "{") { if (tok2->str() == "{") {
if (tok2->strAt(-1) == ")" || tok2->strAt(-2) == ")") if (tok2->strAt(-1) == ")" || tok2->strAt(-2) == ")")
setVarIdClassFunction(scopeName2 + classname, tok2, tok2->link(), thisClassVars, structMembers, &_varId); setVarIdClassFunction(scopeName2 + classname, tok2, tok2->link(), thisClassVars, structMembers, &_varId);
tok2 = tok2->link(); tok2 = tok2->link();
} else if (tok2->str() == "(" && tok2->link()->strAt(1) != "(") } else if (tok2->str() == "(" && tok2->link()->strAt(1) != "(")
tok2 = tok2->link(); tok2 = tok2->link();
}
// Found a member variable..
else if (tok2->varId() > 0)
thisClassVars[tok2->str()] = tok2->varId();
} }
// Found a member variable..
else if (tok2->varId() > 0)
thisClassVars[tok2->str()] = tok2->varId();
} }
// Are there any member variables in this class? // Are there any member variables in this class?