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

More work on template instantiation.

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-10 09:44:18 +02:00
parent 05984e71fc
commit aab9c52030
4 changed files with 90 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -588,8 +588,54 @@ ResolveExpression::resolveBaseExpression(const QList<LookupItem> &baseResults, i
if (accessOp == T_ARROW) {
if (NamedType *namedTy = ty->asNamedType()) {
Overview oo;
qDebug() << "got here:" << oo(namedTy->name());
const Name *arrowAccessOp = control()->operatorNameId(OperatorNameId::ArrowOp);
#if 0
qDebug() << "last visible symbol is:" << result.lastVisibleSymbol()->fileName()
<< result.lastVisibleSymbol()->line()
<< result.lastVisibleSymbol()->column();
#endif
#if 0
if (const QualifiedNameId *q = namedTy->name()->asQualifiedNameId()) {
QList<const Name *> names;
for (unsigned i = 0; i < q->nameCount() - 1; ++i)
names.append(q->nameAt(i));
if (ClassOrNamespace *b = _context.globalNamespace()->findClassOrNamespace(names)) {
qDebug() << "yuppi du" << b << oo(b->_templateId);
foreach (Symbol *s, b->lookup(q->unqualifiedNameId())) {
qDebug() << "r:" << oo(s->type(), s->name());
}
}
}
#endif
foreach (Symbol *s, _context.lookup(namedTy->name(), result.lastVisibleSymbol())) {
qDebug() << "r:" << oo(s->type(), s->name());
if (PointerType *ptrTy = s->type()->asPointerType()) {
FullySpecifiedType elementTy = ptrTy->elementType().simplified();
if (elementTy->isNamedType() || elementTy->isClassType())
results.append(LookupItem(elementTy, lastVisibleSymbol));
} else if (const NamedType *nt = s->type()->asNamedType()) {
qDebug() << "f***";
Symbol *l = _context.lookup(nt->name(), result.lastVisibleSymbol()).first();
qDebug() << "l" << oo(l->type(), l->name());
if (PointerType *ptrTy = l->type()->asPointerType()) {
FullySpecifiedType elementTy = ptrTy->elementType().simplified();
if (elementTy->isNamedType() || elementTy->isClassType())
results.append(LookupItem(elementTy, lastVisibleSymbol));
}
}
}
if (ClassOrNamespace *b = _context.classOrNamespace(namedTy->name(), result.lastVisibleSymbol())) {
foreach (Symbol *overload, b->lookup(arrowAccessOp)) {
if (Function *funTy = overload->type()->asFunctionType()) {