Skip to content

Refs #13296: Fix FP clarifyCondition for cast to pointer to member function #8577

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

Open
chrchr-github wants to merge 4 commits into
base: main
Choose a base branch
from
+5 −2
Open

Refs #13296: Fix FP clarifyCondition for cast to pointer to member function #8577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
903333a
Update tokenlist.cpp
chrchr-github May 26, 2026
2127a08
Update testtokenize.cpp
chrchr-github May 26, 2026
618f5fd
Update tokenlist.cpp
chrchr-github May 26, 2026
3dab56d
Trigger CI
web-flow May 26, 2026
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/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ static bool iscast(const Token *tok, bool cpp)
if (!Token::Match(tok2, "%name%|*|::"))
return false;

if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::Match(tok2->next(), "( * *| )")))
if (tok2->isStandardType() && (tok2->strAt(1) != "(" || Token::simpleMatch(tok2->linkAt(1)->tokAt(-1), "* )")))
type = true;
}

Expand Down
5 changes: 4 additions & 1 deletion test/testtokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8421,7 +8421,8 @@ class TestTokenizer : public TestFixture {

void ccast() {
const char code[] = "a = (int)x;\n" // #13579
"int (*p)[10];\n";
"int (*p)[10];\n"
"b = (void (S::*)(int) const)&y;";

SimpleTokenizer tokenizer(settingsDefault, *this);
ASSERT(tokenizer.tokenize(code));
Expand All @@ -8430,6 +8431,8 @@ class TestTokenizer : public TestFixture {
ASSERT(par->isCast());
par = Token::findsimplematch(par->next(), "(");
ASSERT(!par->isCast());
par = Token::findsimplematch(par->next(), "(");
ASSERT(par->isCast());
}

#define checkHdrs(...) checkHdrs_(__FILE__, __LINE__, __VA_ARGS__)
Expand Down
Loading