Fix #12659 False positive: syntaxError when there is && in array argument (danmar#6341)

chrchr-github · web-flow · commit e5659ccfc3be · 2024-04-25T21:50:47.000+02:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8653,7 +8653,7 @@ void Tokenizer::findGarbageCode() const
             syntaxError(tok);
         if (Token::Match(tok, "%cop%|=|,|[ %or%|%oror%|/|%"))
             syntaxError(tok);
-        if (Token::Match(tok, "[;([{] %comp%|&&|%oror%|%or%|%|/"))
+        if (Token::Match(tok, "[;([{] %comp%|%oror%|%or%|%|/"))
             syntaxError(tok);
         if (Token::Match(tok, "%cop%|= ]") && !(isCPP() && Token::Match(tok->previous(), "%type%|[|,|%num% &|=|> ]")))
             syntaxError(tok);
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -7134,6 +7134,9 @@ class TestTokenizer : public TestFixture {
         ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552
         ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));
 
+        ASSERT_NO_THROW(tokenizeAndStringify("template <typename T, int N>\n" // #12659
+                                             "constexpr void f(T(&&a)[N]) {}"));
+
         ignore_errout();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -7134,6 +7134,9 @@ class TestTokenizer : public TestFixture {`
`7134`	`7134`	`ASSERT_NO_THROW(tokenizeAndStringify("S* g = ::new(ptr) S();")); // #12552`
`7135`	`7135`	`ASSERT_NO_THROW(tokenizeAndStringify("void f(int* p) { return ::delete p; }"));`
`7136`	`7136`
	`7137`	`+ ASSERT_NO_THROW(tokenizeAndStringify("template <typename T, int N>\n" // #12659`
	`7138`	`+ "constexpr void f(T(&&a)[N]) {}"));`
	`7139`	`+`
`7137`	`7140`	`ignore_errout();`
`7138`	`7141`	`}`
`7139`	`7142`