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

Fixed #8838 (False positive on overridden virtual function that is marked both const and final)

This commit is contained in:
Daniel Marjamäki 2018-11-10 21:57:50 +01:00
parent 8327aab127
commit 148f257c6b
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/tokenize.cpp
View File

@ -9060,7 +9060,7 @@ static const std::set<std::string> keywords = {
, "__restrict__" , "__restrict__"
, "__thread" , "__thread"
}; };
// Remove "inline", "register", "restrict", "override", "final", "static" and "constexpr" // Remove "inline", "register", "restrict", "override", "static" and "constexpr"
// "restrict" keyword // "restrict" keyword
// - New to 1999 ANSI/ISO C standard // - New to 1999 ANSI/ISO C standard
// - Not in C++ standard yet // - Not in C++ standard yet
@ -9110,7 +9110,7 @@ void Tokenizer::simplifyKeyword()
// final: // final:
// 1) struct name final { }; <- struct is final // 1) struct name final { }; <- struct is final
if (Token::Match(tok, "%type% final [:{]")) { if (Token::Match(tok->previous(), "struct|class|union %type% final [:{]")) {
tok->deleteNext(); tok->deleteNext();
} }

12
test/testsymboldatabase.cpp
View File

@ -294,6 +294,7 @@ private:
TEST_CASE(symboldatabase71); TEST_CASE(symboldatabase71);
TEST_CASE(symboldatabase72); // #8600 TEST_CASE(symboldatabase72); // #8600
TEST_CASE(symboldatabase73); // #8603 TEST_CASE(symboldatabase73); // #8603
TEST_CASE(symboldatabase74); // #8838 - final
TEST_CASE(createSymbolDatabaseFindAllScopes1); TEST_CASE(createSymbolDatabaseFindAllScopes1);
@ -4135,6 +4136,17 @@ private:
ASSERT_EQUALS(3, f2->function->token->linenr()); ASSERT_EQUALS(3, f2->function->token->linenr());
} }
void symboldatabase74() { // #8838 - final
GET_SYMBOL_DB("class Base { virtual int f() const = 0; };\n"
"class Derived : Base { virtual int f() const final { return 6; } };");
ASSERT_EQUALS(4, db->scopeList.size());
ASSERT_EQUALS(1, db->functionScopes.size());
const Scope *f1 = db->functionScopes[0];
ASSERT(f1->function->hasFinalSpecifier());
}
void createSymbolDatabaseFindAllScopes1() { void createSymbolDatabaseFindAllScopes1() {
GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }"); GET_SYMBOL_DB("void f() { union {int x; char *p;} a={0}; }");
ASSERT(db->scopeList.size() == 3); ASSERT(db->scopeList.size() == 3);