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

Extract duplicate code

This commit is contained in:
Dmitry-Me 2015-12-18 10:24:02 +03:00
parent 4a3c61f031
commit 166e2a2cb8
1 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
lib/symboldatabase.cpp
View File

@ -2528,6 +2528,29 @@ void SymbolDatabase::printXml(std::ostream &out) const
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
static const Type* findVariableTypeIncludingUsedNamespaces(const SymbolDatabase* symbolDatabase, const Scope* scope, const Token* typeTok)
{
const Type* argType = symbolDatabase->findVariableType(scope, typeTok);
if (argType)
return argType;
// look for variable type in any using namespace in this scope or above
while (scope) {
for (std::list<Scope::UsingInfo>::const_iterator ui = scope->usingList.begin();
ui != scope->usingList.end(); ++ui) {
if (ui->scope) {
argType = symbolDatabase->findVariableType(ui->scope, typeTok);
if (argType)
return argType;
}
}
scope = scope->nestedIn;
}
return nullptr;
}
//---------------------------------------------------------------------------
void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *scope) void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *scope)
{ {
// check for non-empty argument list "( ... )" // check for non-empty argument list "( ... )"
@ -2587,24 +2610,7 @@ void Function::addArguments(const SymbolDatabase *symbolDatabase, const Scope *s
const ::Type *argType = nullptr; const ::Type *argType = nullptr;
if (!typeTok->isStandardType()) { if (!typeTok->isStandardType()) {
argType = symbolDatabase->findVariableType(scope, typeTok); argType = findVariableTypeIncludingUsedNamespaces(symbolDatabase, scope, typeTok);
if (!argType) {
// look for variable type in any using namespace in this scope or above
const Scope *currentScope = scope;
while (currentScope) {
for (std::list<Scope::UsingInfo>::const_iterator ui = currentScope->usingList.begin();
ui != currentScope->usingList.end(); ++ui) {
if (ui->scope) {
argType = symbolDatabase->findVariableType(ui->scope, typeTok);
if (argType)
break;
}
}
if (argType)
break;
currentScope = currentScope->nestedIn;
}
}
} }
// skip default values // skip default values
@ -2956,24 +2962,7 @@ const Token *Scope::checkVariable(const Token *tok, AccessControl varaccess, con
const Type *vType = nullptr; const Type *vType = nullptr;
if (typetok) { if (typetok) {
vType = check->findVariableType(this, typetok); vType = findVariableTypeIncludingUsedNamespaces(check, this, typetok);
if (!vType) {
// look for variable type in any using namespace in this scope or above
const Scope *parent = this;
while (parent) {
for (std::list<Scope::UsingInfo>::const_iterator ui = parent->usingList.begin();
ui != parent->usingList.end(); ++ui) {
if (ui->scope) {
vType = check->findVariableType(ui->scope, typetok);
if (vType)
break;
}
}
if (vType)
break;
parent = parent->nestedIn;
}
}
} }
addVariable(vartok, typestart, vartok->previous(), varaccess, vType, this, lib); addVariable(vartok, typestart, vartok->previous(), varaccess, vType, this, lib);