Skip to content

Get type from auto with index operator #4826

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
firewave merged 9 commits into from
Feb 28, 2023
Merged

Get type from auto with index operator #4826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
91e73c3
Get type from auto with scope
chrchr-github Feb 24, 2023
ee288e0
Useless cast
chrchr-github Feb 24, 2023
891667a
Use find() with offset
chrchr-github Feb 24, 2023
11044bc
Fix indices
chrchr-github Feb 24, 2023
de755e6
Merge remote-tracking branch 'origin/main' into chr_typedecl
chrchr-github Feb 24, 2023
03fd768
Get type from auto with index operator
chrchr-github Feb 24, 2023
4b50d0f
Fix function lookup
chrchr-github Feb 25, 2023
da5d64f
Remove duplicate
chrchr-github Feb 25, 2023
4a76c7c
Format
chrchr-github Feb 25, 2023
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
6 changes: 6 additions & 0 deletions lib/token.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2265,6 +2265,12 @@ std::pair<const Token*, const Token*> Token::typeDecl(const Token* tok, bool poi
if (Token::simpleMatch(tok2, "=") && Token::Match(tok2->astOperand2(), "!!=") && tok != tok2->astOperand2()) {
tok2 = tok2->astOperand2();

if (Token::simpleMatch(tok2, "[") && tok2->astOperand1()) {
const ValueType* vt = tok2->astOperand1()->valueType();
if (vt && vt->containerTypeToken)
return { vt->containerTypeToken, vt->containerTypeToken->linkAt(-1) };
}

const Token* varTok = tok2; // try to find a variable
if (Token::Match(varTok, ":: %name%"))
varTok = varTok->next();
Expand Down
12 changes: 12 additions & 0 deletions test/testfunctions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1975,6 +1975,18 @@ class TestFunctions : public TestFixture {
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f(std::vector<std::unordered_map<int, std::unordered_set<int>>>& v, int i, int j) {\n"
" auto& s = v[i][j];\n"
" s.insert(0);\n"
Copy link
Copy Markdown
Contributor

@pfultz2 pfultz2 Feb 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There should be test that the valueType of s is unordered_set.

Copy link
Copy Markdown
Collaborator Author

@chrchr-github chrchr-github Feb 25, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Turns out the ValueType was correct all along, but we don't use that when looking up member functions.
I have added a test where there is no ambiguity between containers.

"}\n");
ASSERT_EQUALS("", errout.str());

check("int f(const std::vector<std::string>& v, int i, char c) {\n"
" const auto& s = v[i];\n"
" return s.find(c);\n"
"}\n");
ASSERT_EQUALS("", errout.str());

settings = settings_old;
}

Expand Down
14 changes: 14 additions & 0 deletions test/testsymboldatabase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ class TestSymbolDatabase : public TestFixture {

TEST_CASE(valueType1);
TEST_CASE(valueType2);
TEST_CASE(valueType3);
TEST_CASE(valueTypeThis);

TEST_CASE(variadic1); // #7453
Expand Down Expand Up @@ -8115,6 +8116,19 @@ class TestSymbolDatabase : public TestFixture {
}
}

void valueType3() {
GET_SYMBOL_DB("void f(std::vector<std::unordered_map<int, std::unordered_set<int>>>& v, int i, int j) {\n"
" auto& s = v[i][j];\n"
" s.insert(0);\n"
"}\n");
ASSERT_EQUALS("", errout.str());

const Token* tok = tokenizer.tokens();
tok = Token::findsimplematch(tok, "s .");
ASSERT(tok && tok->valueType());
ASSERT_EQUALS("container(std :: set|unordered_set <)", tok->valueType()->str());
}

void valueTypeThis() {
ASSERT_EQUALS("C *", typeOf("class C { C() { *this = 0; } };", "this"));
ASSERT_EQUALS("const C *", typeOf("class C { void foo() const; }; void C::foo() const { *this = 0; }", "this"));
Expand Down