Skip to content

Fix #14085 Add isExplicit attribute to operators #7761

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
olabetskyi merged 3 commits into from
Aug 22, 2025
Merged

Fix #14085 Add isExplicit attribute to operators #7761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e18b7ba
Fix #14085 Add isExplicit attribute to operators
olabetskyi Aug 21, 2025
8ee9d3d
Nit
olabetskyi Aug 21, 2025
b0ac098
Nit 2
olabetskyi Aug 21, 2025
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
10 changes: 8 additions & 2 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2578,8 +2578,6 @@ Function::Function(const Token *tok,
// constructor of any kind
else
type = FunctionType::eConstructor;

isExplicit(tokenDef->strAt(-1) == "explicit" || tokenDef->strAt(-2) == "explicit");
}

const Token *tok1 = setFlags(tok, scope);
Expand Down Expand Up @@ -2653,6 +2651,14 @@ Function::Function(const Token *tok,
isInline(true);
hasBody(true);
}

for (tok = tokenDef->previous(); Token::Match(tok, "&|&&|*|::|)|]|%name%"); tok = tok->previous()) {
// We should set other keywords here as well
if (tok->str() == "explicit")
isExplicit(true);
if (tok->str() == "]" || tok->str() == ")")
tok = tok->link();
}
}

Function::Function(const Token *tokenDef, const std::string &clangType)
Expand Down
12 changes: 12 additions & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ class TestSymbolDatabase : public TestFixture {
TEST_CASE(symboldatabase109); // #13553
TEST_CASE(symboldatabase110);
TEST_CASE(symboldatabase111); // [[fallthrough]]
TEST_CASE(symboldatabase112); // explicit operator

TEST_CASE(createSymbolDatabaseFindAllScopes1);
TEST_CASE(createSymbolDatabaseFindAllScopes2);
Expand Down Expand Up @@ -5841,6 +5842,17 @@ class TestSymbolDatabase : public TestFixture {
ASSERT(case3 && case3->isAttributeFallthrough());
}

void symboldatabase112() { // explicit operator
GET_SYMBOL_DB("class S {\n"
" explicit constexpr operator bool() const noexcept { return ptr_ != nullptr; }\n"
"private:\n"
" void *ptr_{nullptr};\n"
"};\n");
const Token *f = db ? Token::findsimplematch(tokenizer.tokens(), "operatorbool") : nullptr;
ASSERT(f != nullptr);
ASSERT(f && f->function() && f->function()->isExplicit());
}

void createSymbolDatabaseFindAllScopes1() {
GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
ASSERT(db->scopeList.size() == 3);
Expand Down