Fix #12718 restrict wrongly treated as keyword (cppcheck-opensource#6390)

chrchr-github · web-flow · commit 89f565739233 · 2024-05-09T10:12:56.000+02:00
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -100,38 +100,6 @@ static const std::unordered_set<std::string> controlFlowKeywords = {
     "return"
 };
 
-// TODO: replace with Keywords::getX()?
-// Another list of keywords
-static const std::unordered_set<std::string> baseKeywords = {
-    "asm",
-    "auto",
-    "break",
-    "case",
-    "const",
-    "continue",
-    "default",
-    "do",
-    "else",
-    "enum",
-    "extern",
-    "for",
-    "goto",
-    "if",
-    "inline",
-    "register",
-    "restrict",
-    "return",
-    "sizeof",
-    "static",
-    "struct",
-    "switch",
-    "typedef",
-    "union",
-    "volatile",
-    "while",
-    "void"
-};
-
 void Token::update_property_info()
 {
     setFlag(fIsControlFlowKeyword, controlFlowKeywords.find(mStr) != controlFlowKeywords.end());
@@ -146,9 +114,7 @@ void Token::update_property_info()
         else if (std::isalpha((unsigned char)mStr[0]) || mStr[0] == '_' || mStr[0] == '$') { // Name
             if (mImpl->mVarId)
                 tokType(eVariable);
-            else if (mTokensFrontBack.list.isKeyword(mStr))
-                tokType(eKeyword);
-            else if (baseKeywords.count(mStr) > 0)
+            else if (mTokensFrontBack.list.isKeyword(mStr) || mStr == "asm") // TODO: not a keyword
                 tokType(eKeyword);
             else if (mTokType != eVariable && mTokType != eFunction && mTokType != eType && mTokType != eKeyword)
                 tokType(eName);
diff --git a/test/testincompletestatement.cpp b/test/testincompletestatement.cpp
@@ -34,10 +34,10 @@ class TestIncompleteStatement : public TestFixture {
     const Settings settings = settingsBuilder().severity(Severity::warning).build();
 
 #define check(...) check_(__FILE__, __LINE__, __VA_ARGS__)
-    void check_(const char* file, int line, const char code[], bool inconclusive = false) {
+    void check_(const char* file, int line, const char code[], bool inconclusive = false, bool cpp = true) {
         const Settings settings1 = settingsBuilder(settings).certainty(Certainty::inconclusive, inconclusive).build();
 
-        std::vector<std::string> files(1, "test.cpp");
+        std::vector<std::string> files(1, cpp ? "test.cpp" : "test.c");
         Tokenizer tokenizer(settings1, *this);
         PreprocessorHelper::preprocess(code, files, tokenizer, *this);
 
@@ -743,7 +743,7 @@ class TestIncompleteStatement : public TestFixture {
         check("void f() { char * const * a, * const * b; }", true);
         ASSERT_EQUALS("", errout_str());
 
-        check("void f() { char * const * a = 0, * volatile restrict * b; }", true);
+        check("void f() { char * const * a = 0, * volatile restrict * b; }", true, /*cpp*/ false);
         ASSERT_EQUALS("", errout_str());
 
         check("void f() { char * const * a = 0, * volatile const * b; }", true);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -7151,6 +7151,9 @@ class TestTokenizer : public TestFixture {
 
         ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;")); // #12700
 
+        ASSERT_NO_THROW(tokenizeAndStringify("class A { bool restrict() const; };\n"
+                                             "bool A::restrict() const { return true; }")); // #12718
+
         ignore_errout();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -7151,6 +7151,9 @@ class TestTokenizer : public TestFixture {`
`7151`	`7151`
`7152`	`7152`	`ASSERT_NO_THROW(tokenizeAndStringify("typedef struct { typedef int T; } S;")); // #12700`
`7153`	`7153`
	`7154`	`+ ASSERT_NO_THROW(tokenizeAndStringify("class A { bool restrict() const; };\n"`
	`7155`	`+ "bool A::restrict() const { return true; }")); // #12718`
	`7156`	`+`
`7154`	`7157`	`ignore_errout();`
`7155`	`7158`	`}`
`7156`	`7159`