Token: cache isCpp() and isC() values (danmar#6933)

Author: firewave

lib/symboldatabase.cpp

@@ -1804,6 +1804,7 @@ void SymbolDatabase::setArrayDimensionsUsingValueFlow()
                 // In template arguments, there might not be AST
                 // Determine size by using the "raw tokens"
                 TokenList tokenList(&mSettings);
+                tokenList.setLang(dimension.tok->isCpp() ? Standards::Language::CPP : Standards::Language::C);
                 tokenList.addtoken(";", 0, 0, 0, false);
                 bool fail = false;
                 for (const Token *tok = dimension.tok; tok && !Token::Match(tok, "[,>]"); tok = tok->next()) {

lib/token.cpp

@@ -57,8 +57,10 @@ namespace {
 
 const std::list<ValueFlow::Value> TokenImpl::mEmptyValueList;
 
-Token::Token(TokensFrontBack &tokensFrontBack) :
-    mTokensFrontBack(tokensFrontBack)
+Token::Token(TokensFrontBack &tokensFrontBack)
+    : mTokensFrontBack(tokensFrontBack)
+    , mIsC(mTokensFrontBack.list.isC())
+    , mIsCpp(mTokensFrontBack.list.isCPP())
 {
     mImpl = new TokenImpl();
 }
@@ -2653,16 +2655,6 @@ const Token* findLambdaEndScope(const Token* tok) {
     return findLambdaEndScope(const_cast<Token*>(tok));
 }
 
-bool Token::isCpp() const
-{
-    return mTokensFrontBack.list.isCPP();
-}
-
-bool Token::isC() const
-{
-    return mTokensFrontBack.list.isC();
-}
-
 const std::string& Token::fileName() const {
     return mTokensFrontBack.list.getFiles()[mImpl->mFileIndex];
 }

lib/token.h

@@ -1439,6 +1439,10 @@ class CPPCHECKLIB Token {
     /** Internal helper function to avoid excessive string allocations */
     void astStringVerboseRecursive(std::string& ret, nonneg int indent1 = 0, nonneg int indent2 = 0) const;
 
+    // cppcheck-suppress premium-misra-cpp-2023-12.2.1
+    bool mIsC : 1;
+    bool mIsCpp : 1;
+
 public:
     void astOperand1(Token *tok);
     void astOperand2(Token *tok);
@@ -1548,9 +1552,15 @@ class CPPCHECKLIB Token {
         mImpl->mDebug = td;
     }
 
-    bool isCpp() const;
+    bool isCpp() const
+    {
+        return mIsCpp;
+    }
 
-    bool isC() const;
+    bool isC() const
+    {
+        return mIsC;
+    }
 };
 
 Token* findTypeEnd(Token* tok);

test/testtokenlist.cpp

@@ -35,10 +35,12 @@
 
 class TestTokenList : public TestFixture {
 public:
-    TestTokenList() : TestFixture("TestTokenList") {}
+    TestTokenList() : TestFixture("TestTokenList") {
+        settings.enforcedLang = Standards::Language::C;
+    }
 
 private:
-    const Settings settings;
+    /*const*/ Settings settings;
 
     void run() override {
         TEST_CASE(testaddtoken1);
@@ -59,7 +61,7 @@ class TestTokenList : public TestFixture {
 
     void testaddtoken2() const {
         const std::string code = "0xF0000000";
-        /*const*/ Settings settings1;
+        /*const*/ Settings settings1 = settings;
         settings1.platform.int_bit = 32;
         TokenList tokenlist(&settings1);
         tokenlist.addtoken(code, 1, 1, false);