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

Improved the member lookup of typedef symbols.

Browse Source
This commit is contained in:
Roberto Raggi
2009-06-10 14:45:27 +02:00
parent 053f9b449c
commit 225c784af4
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/libs/cplusplus/ResolveExpression.cpp
View File

@@ -628,26 +628,37 @@ ResolveExpression::resolveMemberExpression(const QList<Result> &baseResults,
ty = refTy->elementType();
if (NamedType *namedTy = ty->asNamedType()) {
const QList<Symbol *> classObjectCandidates =
resolveClass(namedTy, p, _context);
resolveClass.setPointerAccess(true);
QList<Symbol *> classObjectCandidates = resolveClass(namedTy, p, _context);
foreach (Symbol *classObject, classObjectCandidates) {
const QList<Result> overloads = resolveArrowOperator(p, namedTy,
classObject->asClass());
foreach (Result r, overloads) {
FullySpecifiedType ty = r.first;
Function *funTy = ty->asFunctionType();
if (! funTy)
continue;
results += resolveMember(p, memberName,
control()->namedType(classObject->name()), // ### remove the call to namedType
classObject->asClass());
}
ty = funTy->returnType();
if (classObjectCandidates.isEmpty()) {
resolveClass.setPointerAccess(false);
classObjectCandidates = resolveClass(namedTy, p, _context);
if (ReferenceType *refTy = ty->asReferenceType())
ty = refTy->elementType();
foreach (Symbol *classObject, classObjectCandidates) {
const QList<Result> overloads = resolveArrowOperator(p, namedTy,
classObject->asClass());
foreach (Result r, overloads) {
FullySpecifiedType ty = r.first;
Function *funTy = ty->asFunctionType();
if (! funTy)
continue;
if (PointerType *ptrTy = ty->asPointerType()) {
if (NamedType *namedTy = ptrTy->elementType()->asNamedType())
results += resolveMember(r, memberName, namedTy);
ty = funTy->returnType();
if (ReferenceType *refTy = ty->asReferenceType())
ty = refTy->elementType();
if (PointerType *ptrTy = ty->asPointerType()) {
if (NamedType *namedTy = ptrTy->elementType()->asNamedType())
results += resolveMember(r, memberName, namedTy);
}
}
}
}
@@ -822,8 +833,15 @@ bool ResolveExpression::visit(PostIncrDecrAST *)
////////////////////////////////////////////////////////////////////////////////
ResolveClass::ResolveClass()
: _pointerAccess(false)
{ }
bool ResolveClass::pointerAccess() const
{ return _pointerAccess; }
void ResolveClass::setPointerAccess(bool pointerAccess)
{ _pointerAccess = pointerAccess; }
QList<Symbol *> ResolveClass::operator()(NamedType *namedTy,
ResolveExpression::Result p,
const LookupContext &context)
@@ -864,7 +882,13 @@ QList<Symbol *> ResolveClass::resolveClass(NamedType *namedTy,
resolvedSymbols.append(klass);
} else if (candidate->isTypedef()) {
if (Declaration *decl = candidate->asDeclaration()) {
if (Class *asClass = decl->type()->asClassType()) {
if (_pointerAccess && decl->type()->isPointerType()) {
PointerType *ptrTy = decl->type()->asPointerType();
_pointerAccess = false;
const ResolveExpression::Result r(ptrTy->elementType(), decl);
resolvedSymbols += resolveClass(r, context);
_pointerAccess = true;
} else if (Class *asClass = decl->type()->asClassType()) {
// typedef struct { } Point;
// Point pt;
// pt.

4
src/libs/cplusplus/ResolveExpression.h
View File

@@ -130,6 +130,9 @@ class CPLUSPLUS_EXPORT ResolveClass
public:
ResolveClass();
bool pointerAccess() const;
void setPointerAccess(bool pointerAccess);
QList<Symbol *> operator()(NamedType *namedTy,
ResolveExpression::Result p,
const LookupContext &context);
@@ -147,6 +150,7 @@ private:
private:
QList<ResolveExpression::Result> _blackList;
bool _pointerAccess;
};