Tokenizer::varId: Fixed wrong varid for shadow types with same names as class members

danmar · danmar · commit 752e9d0fb734 · 2014-01-09T21:44:29.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2330,19 +2330,25 @@ static void setVarIdClassDeclaration(Token * const startToken,
 
 // Update the variable ids..
 // Parse each function..
-static void setVarIdClassFunction(Token * const startToken,
+static void setVarIdClassFunction(const std::string &classname,
+                                  Token * const startToken,
                                   const Token * const endToken,
                                   const std::map<std::string, unsigned int> &varlist,
                                   std::map<unsigned int, std::map<std::string,unsigned int> > *structMembers,
                                   unsigned int *_varId)
 {
     for (Token *tok2 = startToken; tok2 && tok2 != endToken; tok2 = tok2->next()) {
-        if (tok2->varId() == 0 && (tok2->previous()->str() != "." || tok2->strAt(-2) == "this")) {
-            const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str());
-            if (it != varlist.end()) {
-                tok2->varId(it->second);
-                setVarIdStructMembers(&tok2, structMembers, _varId);
-            }
+        if (tok2->varId() != 0 || !tok2->isName())
+            continue;
+        if (Token::Match(tok2->tokAt(-2), ("!!"+classname+" :: ").c_str()))
+            continue;
+        if (Token::Match(tok2->tokAt(-2), "!!this . "))
+            continue;
+
+        const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str());
+        if (it != varlist.end()) {
+            tok2->varId(it->second);
+            setVarIdStructMembers(&tok2, structMembers, _varId);
         }
     }
 }
@@ -2594,7 +2600,7 @@ void Tokenizer::setVarId()
                     if (Token::Match(tok2, ") const|volatile| {")) {
                         while (tok2->str() != "{")
                             tok2 = tok2->next();
-                        setVarIdClassFunction(tok2, tok2->link(), varlist, &structMembers, &_varId);
+                        setVarIdClassFunction(classname, tok2, tok2->link(), varlist, &structMembers, &_varId);
                     }
 
                     // constructor with initializer list
@@ -2607,7 +2613,7 @@ void Tokenizer::setVarId()
                             tok3 = tok3->linkAt(3);
                         }
                         if (Token::simpleMatch(tok3, ") {")) {
-                            setVarIdClassFunction(tok2, tok3->next()->link(), varlist, &structMembers, &_varId);
+                            setVarIdClassFunction(classname, tok2, tok3->next()->link(), varlist, &structMembers, &_varId);
                         }
                     }
                 }
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -282,6 +282,7 @@ class TestTokenizer : public TestFixture {
         TEST_CASE(varid_in_class11);    // #4277 - anonymous union
         TEST_CASE(varid_in_class12);    // #4637 - method
         TEST_CASE(varid_in_class13);    // #4637 - method
+        TEST_CASE(varid_in_class14);
         TEST_CASE(varid_initList);
         TEST_CASE(varid_operator);
         TEST_CASE(varid_throw);
@@ -4451,6 +4452,24 @@ class TestTokenizer : public TestFixture {
                       tokenizeDebugListing(code2, false, "test.cpp"));
     }
 
+    void varid_in_class14() {
+        const char code[] = "class Tokenizer { TokenList list; };\n"
+                            "\n"
+                            "void Tokenizer::f() {\n"
+                            "  std::list<int> x;\n"               // <- not member variable
+                            "  list.do_something();\n"            // <- member variable
+                            "  Tokenizer::list.do_something();\n" // <- redundant scope info
+                            "}\n";
+        ASSERT_EQUALS("\n\n##file 0\n"
+                      "1: class Tokenizer { TokenList list@1 ; } ;\n"
+                      "2:\n"
+                      "3: void Tokenizer :: f ( ) {\n"
+                      "4: std :: list < int > x@2 ;\n"
+                      "5: list@1 . do_something ( ) ;\n"
+                      "6: Tokenizer :: list@1 . do_something ( ) ;\n"
+                      "7: }\n", tokenizeDebugListing(code, false, "test.cpp"));
+    }
+
     void varid_initList() {
         const char code1[] = "class A {\n"
                              "  A() : x(0) {}\n"

Original file line number	Diff line number	Diff line change
`@@ -2330,19 +2330,25 @@ static void setVarIdClassDeclaration(Token * const startToken,`
`2330`	`2330`
`2331`	`2331`	`// Update the variable ids..`
`2332`	`2332`	`// Parse each function..`
`2333`		`-static void setVarIdClassFunction(Token * const startToken,`
	`2333`	`+static void setVarIdClassFunction(const std::string &classname,`
	`2334`	`+ Token * const startToken,`
`2334`	`2335`	`const Token * const endToken,`
`2335`	`2336`	`const std::map<std::string, unsigned int> &varlist,`
`2336`	`2337`	`std::map<unsigned int, std::map<std::string,unsigned int> > *structMembers,`
`2337`	`2338`	`unsigned int *_varId)`
`2338`	`2339`	`{`
`2339`	`2340`	`for (Token *tok2 = startToken; tok2 && tok2 != endToken; tok2 = tok2->next()) {`
`2340`		`- if (tok2->varId() == 0 && (tok2->previous()->str() != "." \|\| tok2->strAt(-2) == "this")) {`
`2341`		`- const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str());`
`2342`		`- if (it != varlist.end()) {`
`2343`		`- tok2->varId(it->second);`
`2344`		`- setVarIdStructMembers(&tok2, structMembers, _varId);`
`2345`		`- }`
	`2341`	`+ if (tok2->varId() != 0 \|\| !tok2->isName())`
	`2342`	`+ continue;`
	`2343`	`+ if (Token::Match(tok2->tokAt(-2), ("!!"+classname+" :: ").c_str()))`
	`2344`	`+ continue;`
	`2345`	`+ if (Token::Match(tok2->tokAt(-2), "!!this . "))`
	`2346`	`+ continue;`
	`2347`	`+`
	`2348`	`+ const std::map<std::string,unsigned int>::const_iterator it = varlist.find(tok2->str());`
	`2349`	`+ if (it != varlist.end()) {`
	`2350`	`+ tok2->varId(it->second);`
	`2351`	`+ setVarIdStructMembers(&tok2, structMembers, _varId);`
`2346`	`2352`	`}`
`2347`	`2353`	`}`
`2348`	`2354`	`}`
`@@ -2594,7 +2600,7 @@ void Tokenizer::setVarId()`
`2594`	`2600`	`if (Token::Match(tok2, ") const\|volatile\| {")) {`
`2595`	`2601`	`while (tok2->str() != "{")`
`2596`	`2602`	`tok2 = tok2->next();`
`2597`		`- setVarIdClassFunction(tok2, tok2->link(), varlist, &structMembers, &_varId);`
	`2603`	`+ setVarIdClassFunction(classname, tok2, tok2->link(), varlist, &structMembers, &_varId);`
`2598`	`2604`	`}`
`2599`	`2605`
`2600`	`2606`	`// constructor with initializer list`
`@@ -2607,7 +2613,7 @@ void Tokenizer::setVarId()`
`2607`	`2613`	`tok3 = tok3->linkAt(3);`
`2608`	`2614`	`}`
`2609`	`2615`	`if (Token::simpleMatch(tok3, ") {")) {`
`2610`		`- setVarIdClassFunction(tok2, tok3->next()->link(), varlist, &structMembers, &_varId);`
	`2616`	`+ setVarIdClassFunction(classname, tok2, tok3->next()->link(), varlist, &structMembers, &_varId);`
`2611`	`2617`	`}`
`2612`	`2618`	`}`
`2613`	`2619`	`}`