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

Disable the copy of SemanticEnvironment.

Browse Source
This commit is contained in:
Roberto Raggi
2010-07-19 19:24:31 +02:00
parent 1702543d80
commit 55936532c2
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/cplusplus/CppRewriter.cpp
View File

@@ -43,7 +43,7 @@ using namespace CPlusPlus;
class CPlusPlus::Rewrite
{
public:
Rewrite(Control *control, const SubstitutionEnvironment &env)
Rewrite(Control *control, SubstitutionEnvironment *env)
: control(control), env(env), rewriteType(this), rewriteName(this) {}
class RewriteType: public TypeVisitor
@@ -118,7 +118,7 @@ public:
virtual void visit(NamedType *type)
{
FullySpecifiedType ty = rewrite->env.apply(type->name(), rewrite);
FullySpecifiedType ty = rewrite->env->apply(type->name(), rewrite);
if (! ty->isUndefinedType())
temps.append(rewrite->rewriteType(ty));
else {
@@ -281,7 +281,7 @@ public:
public: // attributes
Control *control;
SubstitutionEnvironment env;
SubstitutionEnvironment *env;
RewriteType rewriteType;
RewriteName rewriteName;
};
@@ -309,9 +309,9 @@ FullySpecifiedType ContextSubstitution::apply(const Name *name, Rewrite *rewrite
<< r.scope()->owner()->column();
ContextSubstitution subst(_context, s->scope());
rewrite->env.enter(&subst);
rewrite->env->enter(&subst);
FullySpecifiedType ty = rewrite->rewriteType(s->type());
rewrite->env.leave();
rewrite->env->leave();
return ty;
}
@@ -348,7 +348,7 @@ FullySpecifiedType SubstitutionMap::apply(const Name *name, Rewrite *) const
}
FullySpecifiedType CPlusPlus::rewriteType(const FullySpecifiedType &type,
const SubstitutionEnvironment &env,
SubstitutionEnvironment *env,
Control *control)
{
Rewrite rewrite(control, env);
@@ -356,7 +356,7 @@ FullySpecifiedType CPlusPlus::rewriteType(const FullySpecifiedType &type,
}
const Name *CPlusPlus::rewriteName(const Name *name,
const SubstitutionEnvironment &env,
SubstitutionEnvironment *env,
Control *control)
{
Rewrite rewrite(control, env);

7
src/libs/cplusplus/CppRewriter.h
View File

@@ -50,9 +50,12 @@ public:
class CPLUSPLUS_EXPORT SubstitutionEnvironment
{
Q_DISABLE_COPY(SubstitutionEnvironment)
QList<Substitution *> substs;
public:
SubstitutionEnvironment() {}
FullySpecifiedType apply(const Name *name, Rewrite *rewrite) const
{
if (name) {
@@ -107,11 +110,11 @@ private:
};
CPLUSPLUS_EXPORT FullySpecifiedType rewriteType(const FullySpecifiedType &type,
const SubstitutionEnvironment &env,
SubstitutionEnvironment *env,
Control *control);
CPLUSPLUS_EXPORT const Name *rewriteName(const Name *name,
const SubstitutionEnvironment &env,
SubstitutionEnvironment *env,
Control *control);
} // end of namespace CPlusPlus

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

@@ -572,7 +572,7 @@ QList<LookupItem> ResolveExpression::getMembers(ClassOrNamespace *binding, const
env.enter(&ctxSubst);
env.enter(&map);
FullySpecifiedType instantiatedTy = rewriteType(decl->type(), env, _context.control().data());
FullySpecifiedType instantiatedTy = rewriteType(decl->type(), &env, _context.control().data());
Overview oo;
oo.setShowReturnTypes(true);