Fix #12006 Improve unknownMacro message (#5470)

danmar · Sep 20, 2023 · dc59543 · dc59543
1 parent 57bbb17
commit dc59543
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -8195,7 +8195,7 @@ void Tokenizer::reportUnknownMacros() const
             if (Token::Match(inner, "[[({]"))
                 inner = inner->link();
             else if (inner->str() == ";")
-                unknownMacroError(inner);
+                unknownMacroError(tok);
         }
     }
 

diff --git a/test/testtokenize.cpp b/test/testtokenize.cpp
@@ -7039,6 +7039,10 @@ class TestTokenizer : public TestFixture {
                                                  "typedef int UStringCaseMapper(icu::BreakIterator* iter);\n"),
                             InternalError,
                             "There is an unknown macro here somewhere. Configuration is required. If U_ICU_ENTRY_POINT_RENAME is a macro then please configure it.");
+
+        ASSERT_THROW_EQUALS(tokenizeAndStringify("void f() { MACRO(x(), y(), \"abc\", z(); ok = true); }\n"), // #12006
+                            InternalError,
+                            "There is an unknown macro here somewhere. Configuration is required. If MACRO is a macro then please configure it.");
     }