Tokenizer: do not report unknownMacro for alignas (cppcheck-opensource#5058)

danmar · web-flow · commit 793d6aef011a · 2023-05-14T15:14:41.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8006,6 +8006,8 @@ static bool isNonMacro(const Token* tok)
         return true;
     if (tok->str().compare(0, 2, "__") == 0) // attribute/annotation
         return true;
+    if (Token::simpleMatch(tok, "alignas ("))
+        return true;
     return false;
 }
 
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -6770,6 +6770,8 @@ class TestTokenizer : public TestFixture {
 
         const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };";
         ASSERT_NO_THROW(tokenizeAndStringify(code11));
+
+        ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;")); // alignas is not unknown macro
     }
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()

Original file line number	Diff line number	Diff line change
`@@ -8006,6 +8006,8 @@ static bool isNonMacro(const Token* tok)`
`8006`	`8006`	`return true;`
`8007`	`8007`	`if (tok->str().compare(0, 2, "__") == 0) // attribute/annotation`
`8008`	`8008`	`return true;`
	`8009`	`+ if (Token::simpleMatch(tok, "alignas ("))`
	`8010`	`+ return true;`
`8009`	`8011`	`return false;`
`8010`	`8012`	`}`
`8011`	`8013`
Original file line number	Diff line number	Diff line change
`@@ -6770,6 +6770,8 @@ class TestTokenizer : public TestFixture {`
`6770`	`6770`
`6771`	`6771`	`const char code11[] = "struct B { B(B&&) noexcept {} ~B() noexcept {} };";`
`6772`	`6772`	`ASSERT_NO_THROW(tokenizeAndStringify(code11));`
	`6773`	`+`
	`6774`	`+ ASSERT_NO_THROW(tokenizeAndStringify("alignas(8) alignas(16) int x;")); // alignas is not unknown macro`
`6773`	`6775`	`}`
`6774`	`6776`
`6775`	`6777`	`void findGarbageCode() { // Test Tokenizer::findGarbageCode()`