Skip to content

Fix #13291 Wrong varid for member pointer to pointer #6988

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
merged 1 commit into from
Nov 9, 2024
Merged

Fix #13291 Wrong varid for member pointer to pointer #6988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -4297,7 +4297,7 @@ static bool setVarIdParseDeclaration(Token*& tok, const VariableMap& variableMap
return false;
}
bracket = true; // Skip: Seems to be valid pointer to array or function pointer
} else if (singleNameCount >= 1 && Token::Match(tok2, "( * %name% [") && Token::Match(tok2->linkAt(3), "] ) [;,]")) {
} else if (singleNameCount >= 1 && Token::Match(tok2, "( * %name% [") && Token::Match(tok2->linkAt(3), "] ) [;,]") && !variableMap.map(false).count(tok2->strAt(2))) {
bracket = true;
} else if (singleNameCount >= 1 && tok2->previous() && tok2->previous()->isStandardType() && Token::Match(tok2, "( *|&| %name% ) ;")) {
bracket = true;
Expand Down
15 changes: 14 additions & 1 deletion test/testvarid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class TestVarID : public TestFixture {
TEST_CASE(varid61); // #4988 inline function
TEST_CASE(varid62);
TEST_CASE(varid63);
TEST_CASE(varid64); // #9928 - extern const char (*x[256])
TEST_CASE(varid64); // #9922 - extern const char (*x[256])
TEST_CASE(varid65); // #10936
TEST_CASE(varid66);
TEST_CASE(varid67); // #11711 - NOT function pointer
Expand Down Expand Up @@ -147,6 +147,7 @@ class TestVarID : public TestFixture {
TEST_CASE(varid_in_class24);
TEST_CASE(varid_in_class25);
TEST_CASE(varid_in_class26);
TEST_CASE(varid_in_class27);
TEST_CASE(varid_namespace_1); // #7272
TEST_CASE(varid_namespace_2); // #7000
TEST_CASE(varid_namespace_3); // #8627
Expand Down Expand Up @@ -2285,6 +2286,18 @@ class TestVarID : public TestFixture {
ASSERT_EQUALS(expected, tokenize(code, true));
}

void varid_in_class27() {
const char code[] = "struct S {\n" // #13291
" int** pp;\n"
" void f() { int x(*pp[0]); }\n"
"};\n";
const char expected[] = "1: struct S {\n"
"2: int * * pp@1 ;\n"
"3: void f ( ) { int x@2 ( * pp@1 [ 0 ] ) ; }\n"
"4: } ;\n";
ASSERT_EQUALS(expected, tokenize(code, true));
}

void varid_namespace_1() { // #7272
const char code[] = "namespace Blah {\n"
" struct foo { int x;};\n"
Expand Down
Loading