Fixed cppcheck-opensource#4857 (False Positive: function argument hides enumerator of same type)

danmar · danmar · commit a9bd6cf3dfef · 2013-06-16T08:13:41.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -7448,10 +7448,31 @@ void Tokenizer::simplifyEnum()
 
                             // are there shadow arguments?
                             if (Token::simpleMatch(tok2->previous(), ") {") || Token::simpleMatch(tok2->tokAt(-2), ") const {")) {
+                                // Determine if this is a executable scope..
+                                bool executableScope = false;
+                                {
+                                    const Token *prev = tok2->previous()->link();
+                                    while (prev) {
+                                        if (prev->str() == "}")
+                                            prev = prev->link();
+                                        else if (prev->str() == "{") {
+                                            while ((prev = prev->previous()) && (prev->isName()));
+                                            if (!prev || prev->str() == ")")
+                                                break;
+                                        }
+                                        prev = prev->previous();
+                                    }
+
+                                    if (prev)
+                                        executableScope = true;
+                                }
+
                                 std::set<std::string> shadowArg;
                                 for (const Token* arg = tok2; arg && arg->str() != "("; arg = arg->previous()) {
                                     if (Token::Match(arg->previous(), "%type%|*|& %type% [,)]") &&
                                         enumValues.find(arg->str()) != enumValues.end()) {
+                                        if (executableScope && Token::Match(arg->previous(), "[*&]"))
+                                            continue;
                                         shadowArg.insert(arg->str());
                                         if (inScope && _settings->isEnabled("style")) {
                                             const EnumValue enumValue = enumValues.find(arg->str())->second;
diff --git a/test/testsimplifytokens.cpp b/test/testsimplifytokens.cpp
@@ -7383,6 +7383,10 @@ class TestSimplifyTokens : public TestFixture {
 
         const char code4[] = "enum { a, b }; void f() { int &a=x; }";
         ASSERT_EQUALS("void f ( ) { int & a = x ; }", checkSimplifyEnum(code4));
+
+        // #4857 - not shadow variable
+        checkSimplifyEnum("enum { a,b }; void f() { if (x) { } else if ( x & a ) {} }");
+        ASSERT_EQUALS("", errout.str());
     }
 
     void enum38() { // #4463

Original file line number	Diff line number	Diff line change
`@@ -7383,6 +7383,10 @@ class TestSimplifyTokens : public TestFixture {`
`7383`	`7383`
`7384`	`7384`	`const char code4[] = "enum { a, b }; void f() { int &a=x; }";`
`7385`	`7385`	`ASSERT_EQUALS("void f ( ) { int & a = x ; }", checkSimplifyEnum(code4));`
	`7386`	`+`
	`7387`	`+ // #4857 - not shadow variable`
	`7388`	`+ checkSimplifyEnum("enum { a,b }; void f() { if (x) { } else if ( x & a ) {} }");`
	`7389`	`+ ASSERT_EQUALS("", errout.str());`
`7386`	`7390`	`}`
`7387`	`7391`
`7388`	`7392`	`void enum38() { // #4463`