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

Improve findEnumerator() (refs #10045) (#5459)

This commit is contained in:
chrchr-github 2023-09-19 11:45:59 +02:00 committed by GitHub
parent 176edbd22c
commit c6b3c56174
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/symboldatabase.cpp
View File

@ -5050,13 +5050,11 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
else { else {
// FIXME search base class here // FIXME search base class here
const Scope* temp{};
if (scope->functionOf && (temp = scope->functionOf->findRecordInNestedList(tok1->str()))) {
scope = temp;
} else {
// find first scope // find first scope
while (scope && scope->nestedIn) { while (scope && scope->nestedIn) {
temp = scope->nestedIn->findRecordInNestedList(tok1->str()); const Scope* temp = scope->nestedIn->findRecordInNestedList(tok1->str());
if (!temp && scope->functionOf)
temp = scope->functionOf->findRecordInNestedList(tok1->str());
if (temp) { if (temp) {
scope = temp; scope = temp;
break; break;
@ -5064,7 +5062,6 @@ const Enumerator * SymbolDatabase::findEnumerator(const Token * tok, std::set<st
scope = scope->nestedIn; scope = scope->nestedIn;
} }
} }
}
if (scope) { if (scope) {
tok1 = tok1->tokAt(2); tok1 = tok1->tokAt(2);

21
test/testsymboldatabase.cpp
View File

@ -5827,6 +5827,7 @@ private:
} }
void enum15() { void enum15() {
{
GET_SYMBOL_DB("struct S {\n" GET_SYMBOL_DB("struct S {\n"
" S();\n" " S();\n"
" enum E { E0 };\n" " enum E { E0 };\n"
@ -5844,6 +5845,26 @@ private:
ASSERT(e && e->enumerator()); ASSERT(e && e->enumerator());
ASSERT_EQUALS(E0, e->enumerator()); ASSERT_EQUALS(E0, e->enumerator());
} }
{
GET_SYMBOL_DB("struct S {\n"
" S(bool x);\n"
" enum E { E0 };\n"
"};\n"
"S::S(bool x) {\n"
" if (x)\n"
" E e = E::E0;\n"
"}\n");
ASSERT(db != nullptr);
auto it = db->scopeList.begin();
std::advance(it, 2);
const Enumerator* E0 = it->findEnumerator("E0");
ASSERT(E0 && E0->value_known && E0->value == 0);
std::advance(it, 1);
const Token* const e = Token::findsimplematch(tokenizer.tokens(), "E0 ;");
ASSERT(e && e->enumerator());
ASSERT_EQUALS(E0, e->enumerator());
}
}
void sizeOfType() { void sizeOfType() {
// #7615 - crash in Symboldatabase::sizeOfType() // #7615 - crash in Symboldatabase::sizeOfType()