feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fixes: Lookup of qualified name ids.

Browse Source
This commit is contained in:
Roberto Raggi
2009-01-24 23:07:42 +01:00
parent 926fc06266
commit a90545126f
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/libs/cplusplus/LookupContext.cpp
View File

@@ -162,8 +162,26 @@ QList<Symbol *> LookupContext::resolve(Name *name, const QList<Scope *> &visible
if (QualifiedNameId *q = name->asQualifiedNameId()) { if (QualifiedNameId *q = name->asQualifiedNameId()) {
QList<Symbol *> candidates; QList<Symbol *> candidates;
QList<Scope *> scopes = visibleScopes; QList<Scope *> scopes = visibleScopes;
Identifier *id = identifier(name); for (unsigned i = 0; i < q->nameCount(); ++i) {
Name *name = q->nameAt(i);
if (i + 1 == q->nameCount())
candidates = resolve(name, scopes, mode);
else
candidates = resolveClassOrNamespace(name, scopes);
if (candidates.isEmpty() || i + 1 == q->nameCount())
break;
scopes.clear();
foreach (Symbol *candidate, candidates) {
if (ScopedSymbol *scoped = candidate->asScopedSymbol()) {
expand(scoped->members(), visibleScopes, &scopes);
}
}
}
Identifier *id = identifier(name);
foreach (Scope *scope, visibleScopes) { foreach (Scope *scope, visibleScopes) {
Symbol *symbol = scope->lookat(id); Symbol *symbol = scope->lookat(id);
for (; symbol; symbol = symbol->next()) { for (; symbol; symbol = symbol->next()) {
@@ -189,26 +207,7 @@ QList<Symbol *> LookupContext::resolve(Name *name, const QList<Scope *> &visible
} }
} }
for (unsigned i = 0; i < q->nameCount(); ++i) { return candidates;
Name *name = q->nameAt(i);
if (i + 1 == q->nameCount())
candidates += resolve(name, scopes, mode);
else
candidates += resolveClassOrNamespace(name, scopes);
if (candidates.isEmpty() || i + 1 == q->nameCount())
return candidates;
scopes.clear();
foreach (Symbol *candidate, candidates) {
if (ScopedSymbol *scoped = candidate->asScopedSymbol()) {
expand(scoped->members(), visibleScopes, &scopes);
}
}
}
return QList<Symbol *>();
} }
QList<Symbol *> candidates; QList<Symbol *> candidates;