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

Fixed handling of this-> and (*this). in setVarId()

This commit is contained in:
PKEuS 2015-11-09 21:43:40 +01:00
parent db342ea910
commit 49a9b011eb
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -2606,7 +2606,7 @@ void Tokenizer::setVarIdClassDeclaration(Token * const startToken,
} }
} else if (tok->isName() && tok->varId() <= scopeStartVarId) { } else if (tok->isName() && tok->varId() <= scopeStartVarId) {
if (indentlevel > 0) { if (indentlevel > 0) {
if (Token::Match(tok->previous(), "::|.")) if (Token::Match(tok->previous(), "::|.") && tok->strAt(-2) != "this" && !Token::Match(tok->tokAt(-5), "( * this ) ."))
continue; continue;
if (tok->next()->str() == "::") { if (tok->next()->str() == "::") {
if (tok->str() == className) if (tok->str() == className)
@ -2644,7 +2644,7 @@ static void setVarIdClassFunction(const std::string &classname,
continue; continue;
if (Token::Match(tok2->tokAt(-4), "%name% :: %name% ::")) // Currently unsupported if (Token::Match(tok2->tokAt(-4), "%name% :: %name% ::")) // Currently unsupported
continue; continue;
if (Token::Match(tok2->tokAt(-2), "!!this .")) if (Token::Match(tok2->tokAt(-2), "!!this .") && !Token::Match(tok2->tokAt(-5), "( * this ) ."))
continue; continue;
const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str()); const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str());

42
test/testvarid.cpp
View File

@ -1646,15 +1646,39 @@ private:
} }
void varid_in_class16() { // Set varId for inline member functions void varid_in_class16() { // Set varId for inline member functions
const char code[] = "class Fred {\n" {
" int x;\n" const char code[] = "class Fred {\n"
" void foo(int x) { this->x = x; }\n" " int x;\n"
"};\n"; " void foo(int x) { this->x = x; }\n"
ASSERT_EQUALS("\n\n##file 0\n" "};\n";
"1: class Fred {\n" ASSERT_EQUALS("\n\n##file 0\n"
"2: int x@1 ;\n" "1: class Fred {\n"
"3: void foo ( int x@2 ) { this . x@1 = x@2 ; }\n" "2: int x@1 ;\n"
"4: } ;\n", tokenize(code, false, "test.cpp")); "3: void foo ( int x@2 ) { this . x@1 = x@2 ; }\n"
"4: } ;\n", tokenize(code, false, "test.cpp"));
}
{
const char code[] = "class Fred {\n"
" void foo(int x) { this->x = x; }\n"
" int x;\n"
"};\n";
ASSERT_EQUALS("\n\n##file 0\n"
"1: class Fred {\n"
"2: void foo ( int x@1 ) { this . x@2 = x@1 ; }\n"
"3: int x@2 ;\n"
"4: } ;\n", tokenize(code, false, "test.cpp"));
}
{
const char code[] = "class Fred {\n"
" void foo(int x) { (*this).x = x; }\n"
" int x;\n"
"};\n";
ASSERT_EQUALS("\n\n##file 0\n"
"1: class Fred {\n"
"2: void foo ( int x@1 ) { ( * this ) . x@2 = x@1 ; }\n"
"3: int x@2 ;\n"
"4: } ;\n", tokenize(code, false, "test.cpp"));
}
} }
void varid_in_class17() { // #6056 - Set no varid for member functions void varid_in_class17() { // #6056 - Set no varid for member functions