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

Fixed #4086: Set varId in initialization list.

This commit is contained in:
PKEuS 2012-08-28 12:44:40 +02:00
parent 9fe9944adb
commit ea85dd305a
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/tokenize.cpp
View File

@ -2585,27 +2585,32 @@ static void setVarIdClassDeclaration(Token * const startToken,
// replace varids.. // replace varids..
unsigned int indentlevel = 0; unsigned int indentlevel = 0;
bool initList = false;
for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) { for (Token *tok = startToken->next(); tok != endToken; tok = tok->next()) {
if (tok->str() == "{") if (tok->str() == "{") {
initList = false;
++indentlevel; ++indentlevel;
else if (tok->str() == "}") } else if (tok->str() == "}")
--indentlevel; --indentlevel;
else if (indentlevel > 0 && tok->isName() && tok->varId() <= scopeStartVarId) { else if (tok->isName() && tok->varId() <= scopeStartVarId) {
if (Token::Match(tok->previous(), "::|.")) if (indentlevel > 0 || (initList && indentlevel == 0 && (tok->strAt(-1) == "," || tok->strAt(-1) == ":"))) {
continue; if (Token::Match(tok->previous(), "::|."))
if (tok->next()->str() == "::") {
if (tok->str() == className)
tok = tok->tokAt(2);
else
continue; continue;
} if (tok->next()->str() == "::") {
if (tok->str() == className)
tok = tok->tokAt(2);
else
continue;
}
const std::map<std::string, unsigned int>::const_iterator it = variableId.find(tok->str()); const std::map<std::string, unsigned int>::const_iterator it = variableId.find(tok->str());
if (it != variableId.end()) { if (it != variableId.end()) {
tok->varId(it->second); tok->varId(it->second);
setVarIdStructMembers(&tok, structMembers, _varId); setVarIdStructMembers(&tok, structMembers, _varId);
}
} }
} } else if (indentlevel == 0 && tok->str() == ":")
initList = true;
} }
} }

14
test/testtokenize.cpp
View File

@ -243,6 +243,7 @@ private:
TEST_CASE(varid_in_class6); // #3755 TEST_CASE(varid_in_class6); // #3755
TEST_CASE(varid_in_class7); // set variable id for struct members TEST_CASE(varid_in_class7); // set variable id for struct members
TEST_CASE(varid_in_class8); // unknown macro in class TEST_CASE(varid_in_class8); // unknown macro in class
TEST_CASE(varid_initList);
TEST_CASE(varid_operator); TEST_CASE(varid_operator);
TEST_CASE(varid_throw); TEST_CASE(varid_throw);
TEST_CASE(varid_unknown_macro); // #2638 - unknown macro is not type TEST_CASE(varid_unknown_macro); // #2638 - unknown macro is not type
@ -3777,6 +3778,19 @@ private:
tokenizeDebugListing(code)); tokenizeDebugListing(code));
} }
void varid_initList() {
const char code[] = "class A {\n"
" A() : x(0) {}\n"
" int x;\n"
"};";
ASSERT_EQUALS("\n\n##file 0\n"
"1: class A {\n"
"2: A ( ) : x@1 ( 0 ) { }\n"
"3: int x@1 ;\n"
"4: } ;\n",
tokenizeDebugListing(code));
}
void varid_operator() { void varid_operator() {
{ {
const std::string actual = tokenizeDebugListing( const std::string actual = tokenizeDebugListing(