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

Try to use the new LookupContext.

Browse Source
This commit is contained in:
Roberto Raggi
2010-05-05 12:06:38 +02:00
parent 66a9ef0725
commit d9527680a9
14 changed files with 325 additions and 446 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libs/cplusplus/GenTemplateInstance.cpp
View File

@@ -47,10 +47,10 @@ namespace {
class ApplySubstitution
{
public:
ApplySubstitution(const DeprecatedLookupContext &context, Symbol *symbol, const GenTemplateInstance::Substitution &substitution);
ApplySubstitution(Control *control, Symbol *symbol, const GenTemplateInstance::Substitution &substitution);
~ApplySubstitution();
Control *control() const { return context.control(); }
inline Control *control() const { return _control; }
FullySpecifiedType apply(const Name *name);
FullySpecifiedType apply(const FullySpecifiedType &type);
@@ -309,16 +309,16 @@ private:
};
public: // attributes
DeprecatedLookupContext context;
Control *_control;
Symbol *symbol;
GenTemplateInstance::Substitution substitution;
ApplyToType applyToType;
ApplyToName applyToName;
};
ApplySubstitution::ApplySubstitution(const DeprecatedLookupContext &context, Symbol *symbol,
ApplySubstitution::ApplySubstitution(Control *control, Symbol *symbol,
const GenTemplateInstance::Substitution &substitution)
: context(context), symbol(symbol),
: _control(control), symbol(symbol),
substitution(substitution),
applyToType(this), applyToName(this)
{ }
@@ -363,17 +363,17 @@ FullySpecifiedType ApplySubstitution::applySubstitution(int index) const
} // end of anonymous namespace
GenTemplateInstance::GenTemplateInstance(const DeprecatedLookupContext &context, const Substitution &substitution)
GenTemplateInstance::GenTemplateInstance(Control *control, const Substitution &substitution)
: _symbol(0),
_context(context),
_control(control),
_substitution(substitution)
{ }
FullySpecifiedType GenTemplateInstance::operator()(Symbol *symbol)
{
ApplySubstitution o(_context, symbol, _substitution);
ApplySubstitution o(_control, symbol, _substitution);
return o.apply(symbol->type());
}
Control *GenTemplateInstance::control() const
{ return _context.control(); }
{ return _control; }