Token: only look up standard types in update_property_info() if necessary

Author: firewave

lib/token.cpp

@@ -127,13 +127,18 @@ void Token::update_property_info()
                 tokType(eVariable);
             else if (mTokensFrontBack.list.isKeyword(mStr)) {
                 tokType(eKeyword);
+                update_property_isStandardType();
                 setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
             }
             else if (mStr == "asm") { // TODO: not a keyword
                 tokType(eKeyword);
             }
-            else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword)
+            // TODO: remove condition? appears to be (no longer necessary) protection for reset of varids in Tokenizer::setVarId()
+            else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword) {
                 tokType(eName);
+                // some types are not being treated as keywords
+                update_property_isStandardType();
+            }
         } else if (simplecpp::Token::isNumberLike(mStr)) {
             if ((MathLib::isInt(mStr) || MathLib::isFloat(mStr)) && mStr.find('_') == std::string::npos)
                 tokType(eNumber);
@@ -174,8 +179,6 @@ void Token::update_property_info()
             tokType(eEllipsis);
         else
             tokType(eOther);
-
-        update_property_isStandardType();
     } else {
         tokType(eNone);
     }

lib/token.h

@@ -952,6 +952,9 @@ class CPPCHECKLIB Token {
         return mImpl->mVarId;
     }
     void varId(nonneg int id) {
+        if (mImpl->mVarId == id)
+            return;
+
         mImpl->mVarId = id;
         // TODO: remove special handling?
         if (id != 0) {

test/testtoken.cpp

@@ -123,6 +123,7 @@ class TestToken : public TestFixture {
         TEST_CASE(update_property_info_ecomparisonop_link);
         TEST_CASE(update_property_info_etype_c);
         TEST_CASE(update_property_info_etype_cpp);
+        TEST_CASE(varid0);
     }
 
     void nextprevious() const {
@@ -1494,6 +1495,18 @@ class TestToken : public TestFixture {
             assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
         }
     }
+
+    void varid0() const
+    {
+        TokenList list_c{&settingsDefault};
+        list_c.setLang(Standards::Language::C);
+        TokensFrontBack tokensFrontBack(list_c);
+        Token tok(tokensFrontBack);
+        tok.str("int"); // not treated as keyword in TokenList::isKeyword()
+        assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
+        tok.varId(0);
+        assert_tok(&tok, Token::Type::eType, /*l=*/ false, /*std=*/ true);
+    }
 #undef assert_tok
 };