Skip to content

Amend fix for #12564 #6231

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 6 commits into from
Apr 4, 2024
Merged

Amend fix for #12564 #6231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d2634ba
Partial fix for #12564 using type for enum class causes false positives
chrchr-github Apr 3, 2024
6e4dddd
Handle scope operator in enum type
chrchr-github Apr 3, 2024
3c42664
Merge branch 'danmar:main' into chr_Fix12564
chrchr-github Apr 4, 2024
cfbf0db
Update symboldatabase.cpp
chrchr-github Apr 4, 2024
d49ef4a
Update testsymboldatabase.cpp
chrchr-github Apr 4, 2024
f8b613f
Update testsymboldatabase.cpp
chrchr-github Apr 4, 2024
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
17 changes: 15 additions & 2 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,20 @@ static bool isExecutableScope(const Token* tok)
return false;
}

static bool isEnumDefinition(const Token* tok)
{
if (!Token::Match(tok, "enum class| %name% {|:"))
return false;
while (!Token::Match(tok, "[{:]"))
tok = tok->next();
if (tok->str() == "{")
return true;
tok = tok->next(); // skip ':'
while (Token::Match(tok, "%name%|::"))
tok = tok->next();
return Token::simpleMatch(tok, "{");
}

void SymbolDatabase::createSymbolDatabaseFindAllScopes()
{
// create global scope
Expand Down Expand Up @@ -163,8 +177,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
if ((tok->isCpp() && tok->isKeyword() &&
((Token::Match(tok, "class|struct|union|namespace ::| %name% final| {|:|::|<") &&
!Token::Match(tok->previous(), "new|friend|const|enum|typedef|mutable|volatile|using|)|(|<")) ||
(Token::Match(tok, "enum class| %name% {") ||
Token::Match(tok, "enum class| %name% : %name% ::|{"))))
isEnumDefinition(tok)))
|| (tok->isC() && tok->isKeyword() && Token::Match(tok, "struct|union|enum %name% {"))) {
const Token *tok2 = tok->tokAt(2);

Expand Down
1 change: 1 addition & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6372,6 +6372,7 @@ class TestSymbolDatabase : public TestFixture {
void enum17() {
{
GET_SYMBOL_DB("struct S {\n" // #12564
" enum class E : std::uint8_t;\n"
" enum class E : std::uint8_t { E0 };\n"
" static void f(S::E e) {\n"
" if (e == S::E::E0) {}\n"
Expand Down