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

Merge pull request #193 from simartin/ticket_5120 

Ticket #5120: New test case, that works now that #5125 is fixed
This commit is contained in:
Daniel Marjamäki 2013-10-30 04:50:49 -07:00
parent 7ccffe7761 463ef2e71e
commit d50eef43a1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/symboldatabase.cpp
View File

@ -2510,7 +2510,7 @@ const Function* Scope::findFunction(const Token *tok) const
for (std::size_t i = 0; i < definedType->derivedFrom.size(); ++i) {
const Type *base = definedType->derivedFrom[i].type;
if (base && base->classScope) {
if (base->classScope == this) // Ticket #5125: Recursive class; tok should have been found already
if (base->classScope == this) // Ticket #5120, #5125: Recursive class; tok should have been found already
continue;
const Function * func = base->classScope->findFunction(tok);
if (func)

5
test/testsymboldatabase.cpp
View File

@ -200,6 +200,7 @@ private:
TEST_CASE(symboldatabase36); // ticket #4892 (segmentation fault)
TEST_CASE(symboldatabase37);
TEST_CASE(symboldatabase38); // ticket #5125 (infinite recursion)
TEST_CASE(symboldatabase39); // ticket #5120 (infinite recursion)
TEST_CASE(isImplicitlyVirtual);
@ -1652,6 +1653,10 @@ private:
"};");
}
void symboldatabase39() { // ticket #5120
check("struct V : { public case {} ; struct U : U void { V *f (int x) (x) } }");
}
void isImplicitlyVirtual() {
{
GET_SYMBOL_DB("class Base {\n"