Fixed cppcheck-opensource#7740 (Tokenizer::setVarId: Function declaration does not start with 'return')

githubharald · danmar · commit ba6cda9c861b · 2016-10-03T10:02:18.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -2766,10 +2766,12 @@ void Tokenizer::setVarIdPass1()
                     continue;
             }
 
-            // function declaration inside executable scope?
+            // function declaration inside executable scope? Function declaration is of form: type name "(" args ")"
             if (scopeStack.top().isExecutable && Token::Match(tok, "%name% [,)]")) {
                 bool par = false;
                 const Token *start, *end;
+
+                // search begin of function declaration
                 for (start = tok; Token::Match(start, "%name%|*|&|,|("); start = start->previous()) {
                     if (start->str() == "(") {
                         if (par)
@@ -2783,8 +2785,15 @@ void Tokenizer::setVarIdPass1()
                     if (start->varId() > 0U)
                         break;
                 }
+
+                // search end of function declaration
                 for (end = tok->next(); Token::Match(end, "%name%|*|&|,"); end = end->next()) {}
-                if (Token::Match(start, "[;{}] %type% %name%|*") && par && Token::simpleMatch(end, ") ;"))
+
+                // there are tokens which can't appear at the begin of a function declaration such as "return"
+                const bool isNotstartKeyword = start->next() && notstart.find(start->next()->str()) != notstart.end();
+
+                // now check if it is a function declaration
+                if (Token::Match(start, "[;{}] %type% %name%|*") && par && Token::simpleMatch(end, ") ;") && !isNotstartKeyword)
                     // function declaration => don't set varid
                     continue;
             }
diff --git a/test/testvarid.cpp b/test/testvarid.cpp
@@ -758,6 +758,15 @@ class TestVarID : public TestFixture {
                                  "3: void bar ( int * p ) ;\n"
                                  "4: }\n";
         ASSERT_EQUALS(expected2, tokenize(code2));
+
+        // #7740
+        const char code3[] = "Float f(float scale) {\n"
+                             "    return Float(val * scale);\n"
+                             "}\n";
+        const char expected3[] = "1: Float f ( float scale@1 ) {\n"
+                                 "2: return Float ( val * scale@1 ) ;\n"
+                                 "3: }\n";
+        ASSERT_EQUALS(expected3, tokenize(code3));
     }
 
     void varid36() { // ticket #2980 (segmentation fault)
