walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

SymbolDatabase; Improved ValueType when container methods items

This commit is contained in:
Daniel Marjamäki 2020-06-26 22:47:28 +02:00
parent b33326bf51
commit f5ace9ffbe
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/symboldatabase.cpp
View File

@ -5323,6 +5323,12 @@ void SymbolDatabase::setValueType(Token *tok, const ValueType &valuetype)
return; return;
} }
if (vt1 && vt1->container && vt1->containerTypeToken && Token::Match(parent, ". %name% (") && vt1->container->getYield(parent->next()->str()) == Library::Container::Yield::ITEM) {
ValueType item;
if (parsedecl(vt1->containerTypeToken, &item, mDefaultSignedness, mSettings))
setValueType(parent->tokAt(2), item);
}
if (vt1 && vt1->smartPointerType && Token::Match(parent, ". %name% (") && parent->originalName() == "->" && !parent->next()->function()) { if (vt1 && vt1->smartPointerType && Token::Match(parent, ". %name% (") && parent->originalName() == "->" && !parent->next()->function()) {
const Scope *scope = vt1->smartPointerType->classScope; const Scope *scope = vt1->smartPointerType->classScope;
const Function *f = scope ? scope->findFunction(parent->next(), false) : nullptr; const Function *f = scope ? scope->findFunction(parent->next(), false) : nullptr;

2
test/testsymboldatabase.cpp
View File

@ -6868,6 +6868,7 @@ private:
vector.startPattern2 = "Vector !!::"; vector.startPattern2 = "Vector !!::";
vector.type_templateArgNo = 0; vector.type_templateArgNo = 0;
vector.arrayLike_indexOp = true; vector.arrayLike_indexOp = true;
vector.functions["front"] = Library::Container::Function{Library::Container::Action::NO_ACTION, Library::Container::Yield::ITEM};
set.library.containers["Vector"] = vector; set.library.containers["Vector"] = vector;
Library::Container string; Library::Container string;
string.startPattern = "test :: string"; string.startPattern = "test :: string";
@ -6878,6 +6879,7 @@ private:
ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", "test.cpp", &set)); ASSERT_EQUALS("container(test :: string)", typeOf("{return test::string();}", "(", "test.cpp", &set));
ASSERT_EQUALS("container(test :: string)", typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", "test.cpp", &set)); ASSERT_EQUALS("container(test :: string)", typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "s", "test.cpp", &set));
ASSERT_EQUALS("container(test :: string)", typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", "test.cpp", &set)); ASSERT_EQUALS("container(test :: string)", typeOf("void foo(Vector<test::string> v) { for (auto s: v) { x=s+s; } }", "+", "test.cpp", &set));
ASSERT_EQUALS("container(test :: string)", typeOf("Vector<test::string> v; x = v.front();", "(", "test.cpp", &set));
} }
// new // new