fixed assumption in setVarIdParseDeclaration() that isC() == false implies isHeader() == true / added TokenList::isHeader() and Tokenizer::isHeader()

Author: firewave

lib/tokenize.cpp

@@ -4079,7 +4079,7 @@ void VariableMap::addVariable(const std::string& varname, bool globalNamespace)
     it->second = ++mVarId;
 }
 
-static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap, bool executableScope, bool cpp, bool c)
+static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap, bool executableScope, bool cpp, bool c, bool header)
 {
     const Token* const tok1 = *tok;
     Token* tok2 = *tok;
@@ -4104,7 +4104,7 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                 tok2 = tok2->linkAt(1)->next();
                 continue;
             }
-            if (Token::Match(tok2, "struct|union|enum") || (!c && Token::Match(tok2, "class|typename"))) {
+            if (Token::Match(tok2, "struct|union|enum") || ((!c || header) && Token::Match(tok2, "class|typename"))) {
                 hasstruct = true;
                 typeCount = 0;
                 singleNameCount = 0;
@@ -4120,8 +4120,8 @@ static bool setVarIdParseDeclaration(Token** tok, const VariableMap& variableMap
                     ++typeCount;
                 ++singleNameCount;
             }
-        } else if (!c && ((TemplateSimplifier::templateParameters(tok2) > 0) ||
-                          Token::simpleMatch(tok2, "< >") /* Ticket #4764 */)) {
+        } else if ((!c || header) && ((TemplateSimplifier::templateParameters(tok2) > 0) ||
+                                      Token::simpleMatch(tok2, "< >") /* Ticket #4764 */)) {
             const Token *start = *tok;
             if (Token::Match(start->previous(), "%or%|%oror%|&&|&|^|+|-|*|/"))
                 return false;
@@ -4601,7 +4601,7 @@ void Tokenizer::setVarIdPass1()
             }
 
             try { /* Ticket #8151 */
-                decl = setVarIdParseDeclaration(&tok2, variableMap, scopeStack.top().isExecutable, isCPP(), isC());
+                decl = setVarIdParseDeclaration(&tok2, variableMap, scopeStack.top().isExecutable, isCPP(), isC(), isHeader());
             } catch (const Token * errTok) {
                 syntaxError(errTok);
             }

lib/tokenize.h

@@ -77,6 +77,11 @@ class CPPCHECKLIB Tokenizer {
         return list.isCPP();
     }
 
+    /** Is it a header. Used for bailouts */
+    bool isHeader() const {
+        return list.isHeader();
+    }
+
     /**
      * Check if inner scope ends with a call to a noreturn function
      * \param endScopeToken The '}' token

lib/tokenlist.cpp

@@ -83,13 +83,14 @@ void TokenList::deallocateTokens()
 void TokenList::determineCppC()
 {
     Settings::Language lang;
+    bool header = false;
+    lang = Path::identify(getSourceFilePath(), &header);
     if (mSettings && mSettings->enforcedLang != Settings::Language::None)
         lang = mSettings->enforcedLang;
-    else
-        lang = Path::identify(getSourceFilePath());
 
     mIsC = lang == Settings::Language::C;
     mIsCpp = lang == Settings::Language::CPP;
+    mIsHeader = header;
 }
 
 int TokenList::appendFileIfNew(std::string fileName)

lib/tokenlist.h

@@ -63,6 +63,11 @@ class CPPCHECKLIB TokenList {
         return mIsCpp;
     }
 
+    /** Is it a header. Used for bailouts */
+    bool isHeader() const {
+        return mIsHeader;
+    }
+
     /**
      * Delete all tokens in given token list
      * @param tok token list to delete
@@ -207,9 +212,12 @@ class CPPCHECKLIB TokenList {
     /** settings */
     const Settings* mSettings{};
 
-    /** File is known to be C/C++ code */
+    /** File is known to be C/C++ source file */
     bool mIsC{};
     bool mIsCpp{};
+
+    /** File is known to be C/C++ header */
+    bool mIsHeader;
 };
 
 /// @}

test/testvarid.cpp

@@ -2737,6 +2737,14 @@ class TestVarID : public TestFixture {
     }
 
     void varid_header() {
+        ASSERT_EQUALS("1: class A ;\n"
+                      "2: struct B {\n"
+                      "3: void setData ( const A & a@1 ) ;\n"
+                      "4: } ;\n",
+                      tokenize("class A;\n"
+                               "struct B {\n"
+                               "    void setData(const A & a);\n"
+                               "}; ", "test.hpp"));
         ASSERT_EQUALS("1: class A ;\n"
                       "2: struct B {\n"
                       "3: void setData ( const A & a@1 ) ;\n"
@@ -2745,6 +2753,14 @@ class TestVarID : public TestFixture {
                                "struct B {\n"
                                "    void setData(const A & a);\n"
                                "}; ", "test.h"));
+        ASSERT_EQUALS("1: void f ( )\n"
+                      "2: {\n"
+                      "3: int class@1 ;\n"
+                      "4: }\n",
+                      tokenize("void f()\n"
+                               "{\n"
+                               "    int class;\n"
+                               "}", "test.h"));
     }
 
     void varid_rangeBasedFor() {