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

Fix #9092 FN missingOverride - subclass in namespace (#3793)

This commit is contained in:
chrchr-github 2022-02-12 08:19:07 +01:00 committed by GitHub
parent 183f611fb6
commit edc5106237
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/symboldatabase.cpp
View File

@ -755,7 +755,7 @@ void SymbolDatabase::createSymbolDatabaseClassInfo()
for (Type& type : typeList) { for (Type& type : typeList) {
// finish filling in base class info // finish filling in base class info
for (Type::BaseInfo & i : type.derivedFrom) { for (Type::BaseInfo & i : type.derivedFrom) {
const Type* found = findType(i.nameTok, type.enclosingScope); const Type* found = findType(i.nameTok, type.enclosingScope, /*lookOutside*/ true);
if (found && found->findDependency(&type)) { if (found && found->findDependency(&type)) {
// circular dependency // circular dependency
//mTokenizer->syntaxError(nullptr); //mTokenizer->syntaxError(nullptr);
@ -5496,7 +5496,7 @@ const Scope *SymbolDatabase::findScope(const Token *tok, const Scope *startScope
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startScope) const const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startScope, bool lookOutside) const
{ {
// skip over struct or union // skip over struct or union
if (Token::Match(startTok, "struct|union")) if (Token::Match(startTok, "struct|union"))
@ -5541,6 +5541,9 @@ const Type* SymbolDatabase::findType(const Token *startTok, const Scope *startSc
type = scope1->definedType; type = scope1->definedType;
if (type) if (type)
return type; return type;
} else if (scope->type == Scope::ScopeType::eNamespace && lookOutside) {
scope = scope->nestedIn;
continue;
} else } else
break; break;
} }

6
lib/symboldatabase.h
View File

@ -1373,9 +1373,9 @@ public:
/** For unit testing only */ /** For unit testing only */
const Scope *findScopeByName(const std::string& name) const; const Scope *findScopeByName(const std::string& name) const;
const Type* findType(const Token *startTok, const Scope *startScope) const; const Type* findType(const Token *startTok, const Scope *startScope, bool lookOutside = false) const;
Type* findType(const Token *startTok, Scope *startScope) const { Type* findType(const Token *startTok, Scope *startScope, bool lookOutside = false) const {
return const_cast<Type*>(this->findType(startTok, const_cast<const Scope *>(startScope))); return const_cast<Type*>(this->findType(startTok, const_cast<const Scope *>(startScope), lookOutside));
} }
const Scope *findScope(const Token *tok, const Scope *startScope) const; const Scope *findScope(const Token *tok, const Scope *startScope) const;

10
test/testclass.cpp
View File

@ -7446,6 +7446,16 @@ private:
" void foo(int);\n" " void foo(int);\n"
"};"); "};");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkOverride("struct B {\n" // #9092
" virtual int f(int i) const = 0;\n"
"};\n"
"namespace N {\n"
" struct D : B {\n"
" virtual int f(int i) const;\n"
" };\n"
"}\n");
ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:6]: (style) The function 'f' overrides a function in a base class but is not marked with a 'override' specifier.\n", errout.str());
} }
void overrideCVRefQualifiers() { void overrideCVRefQualifiers() {