Skip to content

Fix #12006 Improve unknownMacro message #5470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
firewave merged 4 commits into from
Sep 20, 2023
Merged

Fix #12006 Improve unknownMacro message #5470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0c0dba3
Don't set incomplete flag for library function
chrchr-github Sep 19, 2023
46ad9a7
Merge branch 'main' of https://github.com/chrchr-github/cppcheck
chrchr-github Sep 19, 2023
8e8631a
Fix #12006 Improve unknownMacro message
chrchr-github Sep 20, 2023
d9533f3
Merge
chrchr-github Sep 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8195,7 +8195,7 @@ void Tokenizer::reportUnknownMacros() const
if (Token::Match(inner, "[[({]"))
inner = inner->link();
else if (inner->str() == ";")
unknownMacroError(inner);
unknownMacroError(tok);
}
}

Expand Down
4 changes: 4 additions & 0 deletions test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.");
}


Expand Down