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

Fix many DACA2 SymbolDatabase bailout; unhandled code false positives (#1225)

This commit is contained in:
IOBYTE 2018-05-13 13:00:42 -04:00 committed by Daniel Marjamäki
parent 9949768d7c
commit 5c06d08bfb
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/symboldatabase.cpp
View File

@ -100,7 +100,7 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
tok->progressValue()); tok->progressValue());
// Locate next class // Locate next class
if ((_tokenizer->isCPP() && ((Token::Match(tok, "class|struct|union|namespace ::| %name% {|:|::|<") && if ((_tokenizer->isCPP() && ((Token::Match(tok, "class|struct|union|namespace ::| %name% {|:|::|<") &&
!Token::Match(tok->previous(), "new|friend|const|enum|)|(|<")) || !Token::Match(tok->previous(), "new|friend|const|enum|typedef|mutable|volatile|)|(|<")) ||
(Token::Match(tok, "enum class| %name% {") || (Token::Match(tok, "enum class| %name% {") ||
Token::Match(tok, "enum class| %name% : %name% {")))) Token::Match(tok, "enum class| %name% : %name% {"))))
|| (_tokenizer->isC() && Token::Match(tok, "struct|union|enum %name% {"))) { || (_tokenizer->isC() && Token::Match(tok, "struct|union|enum %name% {"))) {
@ -143,10 +143,23 @@ void SymbolDatabase::createSymbolDatabaseFindAllScopes()
else if (Token::Match(tok2, "%name% [")) else if (Token::Match(tok2, "%name% ["))
continue; continue;
// skip template // skip template
else if (Token::Match(tok->previous(), "template class|struct") && else if (Token::simpleMatch(tok2, ";") &&
Token::simpleMatch(tok2->previous(), "> ;")) { Token::Match(tok->previous(), "template|> class|struct")) {
tok = tok2; tok = tok2;
continue; continue;
}
// forward declaration
else if (Token::simpleMatch(tok2, ";") &&
Token::Match(tok, "class|struct|union")) {
// TODO: see if it can be used
tok = tok2;
continue;
}
// skip constructor
else if (Token::simpleMatch(tok2, "(") &&
Token::simpleMatch(tok2->link(), ") ;")) {
tok = tok2->link()->next();
continue;
} else } else
throw InternalError(tok2, "SymbolDatabase bailout; unhandled code", InternalError::SYNTAX); throw InternalError(tok2, "SymbolDatabase bailout; unhandled code", InternalError::SYNTAX);
continue; continue;

22
test/testsymboldatabase.cpp
View File

@ -287,6 +287,7 @@ private:
TEST_CASE(symboldatabase67); // #8538 TEST_CASE(symboldatabase67); // #8538
TEST_CASE(symboldatabase68); // #8560 TEST_CASE(symboldatabase68); // #8560
TEST_CASE(symboldatabase69); TEST_CASE(symboldatabase69);
TEST_CASE(symboldatabase70);
TEST_CASE(enum1); TEST_CASE(enum1);
TEST_CASE(enum2); TEST_CASE(enum2);
@ -3895,6 +3896,27 @@ private:
ASSERT(f && f->function() && !f->function()->isConst()); ASSERT(f && f->function() && !f->function()->isConst());
} }
void symboldatabase70() {
{
GET_SYMBOL_DB("class Map<String,Entry>::Entry* e;");
ASSERT(db != nullptr);
ASSERT(db && db->scopeList.size() == 1);
ASSERT(db && db->variableList().size() == 2);
}
{
GET_SYMBOL_DB("template class boost::token_iterator_generator<boost::offset_separator>::type; void foo() { }");
ASSERT(db != nullptr);
ASSERT(db && db->scopeList.size() == 2);
}
{
GET_SYMBOL_DB("void foo() {\n"
" return class Arm_relocate_functions<big_endian>::thumb32_branch_offset(upper_insn, lower_insn);\n"
"}");
ASSERT(db != nullptr);
ASSERT(db && db->scopeList.size() == 2);
}
}
void enum1() { void enum1() {
GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;"); GET_SYMBOL_DB("enum BOOL { FALSE, TRUE }; enum BOOL b;");