forked from qt-creator/qt-creator
Removed TemplateParameters.
This commit is contained in:
@@ -399,6 +399,8 @@ FullySpecifiedType DeprecatedGenTemplateInstance::gen(Symbol *symbol)
|
||||
FullySpecifiedType DeprecatedGenTemplateInstance::instantiate(const Name *className, Symbol *candidate,
|
||||
QSharedPointer<Control> control)
|
||||
{
|
||||
#warning robe: enable template instantiation
|
||||
#if 0
|
||||
if (className) {
|
||||
if (const TemplateNameId *templId = className->asTemplateNameId()) {
|
||||
if (Class *klass = candidate->scope()->asClass()) {
|
||||
@@ -422,6 +424,6 @@ FullySpecifiedType DeprecatedGenTemplateInstance::instantiate(const Name *classN
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
return candidate->type();
|
||||
}
|
||||
|
||||
@@ -283,8 +283,11 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
|
||||
} else if (Function *fun = scope->asFunction()) {
|
||||
bindings()->lookupInScope(name, fun, &candidates, /*templateId = */ 0, /*binding=*/ 0);
|
||||
|
||||
#warning robe: lookup in template parameters
|
||||
#if 0
|
||||
for (TemplateParameters *it = fun->templateParameters(); it && candidates.isEmpty(); it = it->previous())
|
||||
bindings()->lookupInScope(name, it->scope(), &candidates, /* templateId = */ 0, /*binding=*/ 0);
|
||||
#endif
|
||||
|
||||
if (! candidates.isEmpty())
|
||||
break; // it's an argument or a template parameter.
|
||||
@@ -307,8 +310,11 @@ QList<LookupItem> LookupContext::lookup(const Name *name, Scope *scope) const
|
||||
break; // it's a formal argument.
|
||||
|
||||
} else if (Class *klass = scope->asClass()) {
|
||||
#warning robe: lookup in template parameters
|
||||
#if 0
|
||||
for (TemplateParameters *it = klass->templateParameters(); it && candidates.isEmpty(); it = it->previous())
|
||||
bindings()->lookupInScope(name, it->scope(), &candidates, /* templateId = */ 0, /*binding=*/ 0);
|
||||
#endif
|
||||
|
||||
if (! candidates.isEmpty())
|
||||
break; // it's an argument or a template parameter.
|
||||
|
||||
@@ -550,7 +550,8 @@ bool ResolveExpression::visit(ArrayAccessAST *ast)
|
||||
QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const Name *memberName) const
|
||||
{
|
||||
QList<LookupItem> members;
|
||||
|
||||
#warning robe: enable template instantiation
|
||||
#if 0
|
||||
const QList<LookupItem> originalMembers = binding->find(memberName);
|
||||
|
||||
foreach (const LookupItem &m, originalMembers) {
|
||||
@@ -593,7 +594,7 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
return members;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user