Tokenizer; Warn about unknown macro used in string concatenation

danmar · danmar · commit 5df6d5bc7cab · 2020-02-28T21:52:01.000+01:00
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -9332,6 +9332,15 @@ void Tokenizer::reportUnknownMacros()
             }
         }
     }
+
+    // String concatenation with unknown macros
+    for (const Token *tok = tokens(); tok; tok = tok->next()) {
+        if (Token::Match(tok, "%str% %name% (") && Token::Match(tok->linkAt(2), ") %str%")) {
+            if (list.isKeyword(tok->next()->str()))
+                continue;
+            unknownMacroError(tok->next());
+        }
+    }
 }
 
 void Tokenizer::findGarbageCode() const
diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -7982,6 +7982,9 @@ class TestTokenizer : public TestFixture {
 
         const char code2[] = "void foo() { dostuff(x 0); }";
         ASSERT_THROW(tokenizeAndStringify(code2), InternalError);
+
+        const char code3[] = "f(\"1\" __stringify(48) \"1\");";
+        ASSERT_THROW(tokenizeAndStringify(code3), InternalError);
     }
 
     void findGarbageCode() { // Test Tokenizer::findGarbageCode()

Original file line number	Diff line number	Diff line change
`@@ -9332,6 +9332,15 @@ void Tokenizer::reportUnknownMacros()`
`9332`	`9332`	`}`
`9333`	`9333`	`}`
`9334`	`9334`	`}`
	`9335`	`+`
	`9336`	`+ // String concatenation with unknown macros`
	`9337`	`+ for (const Token *tok = tokens(); tok; tok = tok->next()) {`
	`9338`	`+ if (Token::Match(tok, "%str% %name% (") && Token::Match(tok->linkAt(2), ") %str%")) {`
	`9339`	`+ if (list.isKeyword(tok->next()->str()))`
	`9340`	`+ continue;`
	`9341`	`+ unknownMacroError(tok->next());`
	`9342`	`+ }`
	`9343`	`+ }`
`9335`	`9344`	`}`
`9336`	`9345`
`9337`	`9346`	`void Tokenizer::findGarbageCode() const`
Original file line number	Diff line number	Diff line change
`@@ -7982,6 +7982,9 @@ class TestTokenizer : public TestFixture {`
`7982`	`7982`
`7983`	`7983`	`const char code2[] = "void foo() { dostuff(x 0); }";`
`7984`	`7984`	`ASSERT_THROW(tokenizeAndStringify(code2), InternalError);`
	`7985`	`+`
	`7986`	`+ const char code3[] = "f(\"1\" __stringify(48) \"1\");";`
	`7987`	`+ ASSERT_THROW(tokenizeAndStringify(code3), InternalError);`
`7985`	`7988`	`}`
`7986`	`7989`
`7987`	`7990`	`void findGarbageCode() { // Test Tokenizer::findGarbageCode()`