Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 20 additions & 0 deletions lib/symboldatabase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5266,6 +5266,26 @@ const Variable *Scope::getVariable(const std::string &varname) const

static const Token* skipPointers(const Token* tok)
{
const Token *start = tok;
bool memberPointer = false;
while (tok) {
if (Token::simpleMatch(tok, "::")) {
tok = tok->next();
continue;
}
if (Token::Match(tok, "%type% ::")) {
tok = tok->tokAt(2);
memberPointer = true;
continue;
}
if (Token::Match(tok, "%type% <") && tok->linkAt(1)) {
tok = tok->linkAt(1)->next();
continue;
}
break;
}
if (memberPointer && !Token::simpleMatch(tok, "*"))
return start;
while (Token::Match(tok, "*|&|&&") || (Token::Match(tok, "( [*&]") && Token::Match(tok->link()->next(), "(|["))) {
tok = tok->next();
if (tok && tok->strAt(-1) == "(" && Token::Match(tok, "%type% ::"))
Expand Down
2 changes: 1 addition & 1 deletion test/testother.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10429,7 +10429,7 @@ class TestOther : public TestFixture {

// Member variable pointers
check("void podMemPtrs() {\n"
" int POD::*memptr;\n"
" const int POD::*memptr;\n"
" memptr = &POD::a;\n"
" memptr = &POD::b;\n"
" if (memptr)\n"
Expand Down
16 changes: 16 additions & 0 deletions test/testunusedvar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class TestUnusedVar : public TestFixture {
TEST_CASE(structmember29); // #14075
TEST_CASE(structmember30); // #14131
TEST_CASE(structmember31); // #14130
TEST_CASE(structmember32); // #14483
TEST_CASE(structmember33);
TEST_CASE(structmember_macro);
TEST_CASE(structmember_template_argument); // #13887 - do not report that member used in template argument is unused
TEST_CASE(classmember);
Expand Down Expand Up @@ -2066,6 +2068,20 @@ class TestUnusedVar : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void structmember32() { // #14483
checkStructMemberUsage("struct S {\n"
" int S::* mp;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2:12]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
}

void structmember33() {
checkStructMemberUsage("struct S {\n"
" int A::B<int>::C::* mp;\n"
"};\n");
ASSERT_EQUALS("[test.cpp:2:23]: (style) struct member 'S::mp' is never used. [unusedStructMember]\n", errout_str());
}

void structmember_macro() {
checkStructMemberUsageP("#define S(n) struct n { int a, b, c; };\n"
"S(unused);\n");
Expand Down
Loading