Skip to content

Fix #11003 cppcheckError with nested template arguments #4049

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 4 commits into from
Apr 25, 2022
Merged

Fix #11003 cppcheckError with nested template arguments #4049

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
31c8853
Fix #11003 cppcheckError with nested template arguments
chrchr-github Apr 25, 2022
16e7195
Format
chrchr-github Apr 25, 2022
73621c8
Merge branch 'main' into chr_Fix11003
chrchr-github Apr 25, 2022
37c14dc
Format
chrchr-github Apr 25, 2022
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 @@ -4050,7 +4050,7 @@ void Tokenizer::setVarIdPass1()
const Token *end = tok->findClosingBracket();
while (tok != end) {
if (tok->isName() && !(Token::simpleMatch(tok->next(), "<") &&
Token::Match(tok->tokAt(-2), "std :: %name%"))) {
Token::Match(tok->tokAt(-1), ":: %name%"))) {
const std::map<std::string, int>::const_iterator it = variableMap.find(tok->str());
if (it != variableMap.end())
tok->varId(it->second);
Expand Down
20 changes: 14 additions & 6 deletions test/testvarid.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2339,13 +2339,21 @@ class TestVarID : public TestFixture {
tokenize("VertexArrayIterator<float[2]> attrPos = m_AttributePos.GetIterator<float[2]>();"));
}

void varid_templateParameter() { // #7046 set varid for "X": std::array<int,X> Y;
const char code[] = "const int X = 0;\n"
"std::array<int,X> Y;\n";
void varid_templateParameter() {
{
const char code[] = "const int X = 0;\n" // #7046 set varid for "X": std::array<int,X> Y;
"std::array<int,X> Y;\n";

ASSERT_EQUALS("1: const int X@1 = 0 ;\n"
"2: std :: array < int , X@1 > Y@2 ;\n",
tokenize(code));
ASSERT_EQUALS("1: const int X@1 = 0 ;\n"
"2: std :: array < int , X@1 > Y@2 ;\n",
tokenize(code));
}
{
const char code[] = "std::optional<N::Foo<A>> Foo;\n"; // #11003

ASSERT_EQUALS("1: std :: optional < N :: Foo < A > > Foo@1 ;\n",
tokenize(code));
}
}

void varid_templateUsing() { // #5781 #7273
Expand Down