diff options
| author | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-06-11 10:22:10 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@digia.com> | 2013-06-11 16:30:58 +0200 |
| commit | 50a900e509be2e1f448f29be126ba3b7f8173901 (patch) | |
| tree | 6dd872f08066a0ae492745669b6c026c4e99bac1 /src/libs/cplusplus | |
| parent | 8f1b6656677344e9ca4b6798ddd900725c478b16 (diff) | |
| download | qt-creator-50a900e509be2e1f448f29be126ba3b7f8173901.tar.gz | |
C++: Handle recursive using/typedef declarations
Remember using/typedef declarations we have already looked up and
stop if we try it again.
Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/libs/cplusplus')
| -rw-r--r-- | src/libs/cplusplus/LookupContext.cpp | 13 | ||||
| -rw-r--r-- | src/libs/cplusplus/LookupContext.h | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/libs/cplusplus/LookupContext.cpp b/src/libs/cplusplus/LookupContext.cpp index 3f0eb8ea29..167d9c692a 100644 --- a/src/libs/cplusplus/LookupContext.cpp +++ b/src/libs/cplusplus/LookupContext.cpp @@ -305,7 +305,8 @@ ClassOrNamespace *LookupContext::globalNamespace() const } ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation) const + ClassOrNamespace* enclosingTemplateInstantiation, + QSet<const Declaration *> typedefsBeingResolved) const { if (! scope) { return 0; @@ -324,8 +325,14 @@ ClassOrNamespace *LookupContext::lookupType(const Name *name, Scope *scope, Overview oo; qDebug() << "Looks like" << oo(name) << "is a typedef for" << oo(d->type()); #endif // DEBUG_LOOKUP - if (const NamedType *namedTy = d->type()->asNamedType()) - return lookupType(namedTy->name(), scope); + if (const NamedType *namedTy = d->type()->asNamedType()) { + // Stop on recursive typedef declarations + if (typedefsBeingResolved.contains(d)) + return 0; + return lookupType(namedTy->name(), scope, 0, + QSet<const Declaration *>(typedefsBeingResolved) + << d); + } } } } else if (UsingDeclaration *ud = m->asUsingDeclaration()) { diff --git a/src/libs/cplusplus/LookupContext.h b/src/libs/cplusplus/LookupContext.h index 921c605b14..37b6f339b9 100644 --- a/src/libs/cplusplus/LookupContext.h +++ b/src/libs/cplusplus/LookupContext.h @@ -289,7 +289,9 @@ public: QList<LookupItem> lookup(const Name *name, Scope *scope) const; ClassOrNamespace *lookupType(const Name *name, Scope *scope, - ClassOrNamespace* enclosingTemplateInstantiation = 0) const; + ClassOrNamespace* enclosingTemplateInstantiation = 0, + QSet<const Declaration *> typedefsBeingResolved + = QSet<const Declaration *>()) const; ClassOrNamespace *lookupType(Symbol *symbol, ClassOrNamespace* enclosingTemplateInstantiation = 0) const; ClassOrNamespace *lookupParent(Symbol *symbol) const; |