Skip to content

fix #13945: SymbolDatabase: function 'void ext_func(const callback_fn cb, size_t v)' has 2 arguments #7605

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
danmar merged 2 commits into from
Jun 18, 2025
Merged

fix #13945: SymbolDatabase: function 'void ext_func(const callback_fn cb, size_t v)' has 2 arguments #7605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c91b2a
add test
ludviggunne Jun 17, 2025
98d8325
fix #13945
ludviggunne Jun 17, 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
4 changes: 2 additions & 2 deletions lib/symboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4483,8 +4483,8 @@ void Function::addArguments(const Scope *scope)
nameTok = tok->tokAt(2);
endTok = nameTok->previous();
tok = tok->link();
} else if (tok != startTok && !nameTok && Token::Match(tok, "( * %var% ) (") && Token::Match(tok->link()->linkAt(1), ") [,)]")) {
nameTok = tok->tokAt(2);
} else if (tok != startTok && !nameTok && Token::Match(tok, "( * const| %var% ) (") && Token::Match(tok->link()->linkAt(1), ") [,)]")) {
nameTok = tok->link()->previous();
endTok = nameTok->previous();
tok = tok->link()->linkAt(1);
} else if (tok != startTok && !nameTok && Token::Match(tok, "( * %var% ) [")) {
Expand Down
17 changes: 17 additions & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ class TestSymbolDatabase : public TestFixture {
TEST_CASE(functionArgs19); // #10376
TEST_CASE(functionArgs20);
TEST_CASE(functionArgs21);
TEST_CASE(functionArgs22); // #13945

TEST_CASE(functionImplicitlyVirtual);
TEST_CASE(functionGetOverridden);
Expand Down Expand Up @@ -3064,6 +3065,22 @@ class TestSymbolDatabase : public TestFixture {
ASSERT_EQUALS("", arg->name());
}

void functionArgs22() {
const char code[] = "typedef void (*callback_fn)(void);\n"
"void ext_func(const callback_fn cb, size_t v) {}\n";
GET_SYMBOL_DB(code);
ASSERT(db != nullptr);
ASSERT_EQUALS(1U, db->functionScopes.size());
const auto it = db->functionScopes.cbegin();
Comment thread
ludviggunne marked this conversation as resolved.
const Function *func = (*it)->function;
ASSERT_EQUALS("ext_func", func->name());
ASSERT_EQUALS(2, func->argCount());
const Variable *arg = func->getArgumentVar(0);
ASSERT_EQUALS("cb", arg->name());
arg = func->getArgumentVar(1);
ASSERT_EQUALS("v", arg->name());
}

void functionImplicitlyVirtual() {
GET_SYMBOL_DB("class base { virtual void f(); };\n"
"class derived : base { void f(); };\n"
Expand Down
Loading