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

Symbol database: refactoring of classAndStructTypes parsing. ticket: #2468

This commit is contained in:
Robert Reif 2011-01-20 18:02:52 +01:00 committed by Daniel Marjamäki
parent 70eadb37bd
commit 9dce0dd75c
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/symboldatabase.cpp
View File

@ -38,13 +38,6 @@
SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger) SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *settings, ErrorLogger *errorLogger)
: _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger) : _tokenizer(tokenizer), _settings(settings), _errorLogger(errorLogger)
{ {
// fill the classAndStructTypes set..
for (const Token *tok = _tokenizer->tokens(); tok; tok = tok->next())
{
if (Token::Match(tok, "class|struct %var% [:{;]"))
classAndStructTypes.insert(tok->next()->str());
}
// find all namespaces (class,struct and namespace) // find all namespaces (class,struct and namespace)
Scope *info = new Scope(this, NULL, NULL); Scope *info = new Scope(this, NULL, NULL);
spaceInfoList.push_back(info); spaceInfoList.push_back(info);
@ -59,6 +52,9 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
// only create base list for classes and structures // only create base list for classes and structures
if (new_info->isClassOrStruct()) if (new_info->isClassOrStruct())
{ {
// fill the classAndStructTypes set..
classAndStructTypes.insert(new_info->className);
// goto initial '{' // goto initial '{'
tok2 = initBaseInfo(new_info, tok); tok2 = initBaseInfo(new_info, tok);
} }
@ -81,6 +77,17 @@ SymbolDatabase::SymbolDatabase(const Tokenizer *tokenizer, const Settings *setti
tok = tok2; tok = tok2;
} }
// forward declaration
else if (Token::Match(tok, "class|struct %var% ;"))
{
// fill the classAndStructTypes set..
classAndStructTypes.insert(tok->next()->str());
/** @todo save forward declarations in database someday */
tok = tok->tokAt(2);
continue;
}
else else
{ {
// check for end of space // check for end of space