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

Introduced CPlusPlus::TemplateArguments and fixed a possible mem-leak when using template members.

Browse Source
This commit is contained in:
Roberto Raggi
2009-08-26 11:41:20 +02:00
parent f137bd3b83
commit fc1b435ab4
8 changed files with 82 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/cplusplus/CheckDeclaration.cpp
View File

@@ -72,10 +72,10 @@ CheckDeclaration::~CheckDeclaration()
{ }
void CheckDeclaration::check(DeclarationAST *declaration,
Scope *scope, Scope *templateParameters)
Scope *scope, TemplateParameters *templateParameters)
{
Scope *previousScope = switchScope(scope);
Scope *previousTemplateParameters = switchTemplateParameters(templateParameters);
TemplateParameters *previousTemplateParameters = switchTemplateParameters(templateParameters);
DeclarationAST *previousDeclaration = switchDeclaration(declaration);
accept(declaration);
(void) switchDeclaration(previousDeclaration);
@@ -97,9 +97,9 @@ Scope *CheckDeclaration::switchScope(Scope *scope)
return previousScope;
}
Scope *CheckDeclaration::switchTemplateParameters(Scope *templateParameters)
TemplateParameters *CheckDeclaration::switchTemplateParameters(TemplateParameters *templateParameters)
{
Scope *previousTemplateParameters = _templateParameters;
TemplateParameters *previousTemplateParameters = _templateParameters;
_templateParameters = templateParameters;
return previousTemplateParameters;
}
@@ -395,13 +395,15 @@ bool CheckDeclaration::visit(ParameterDeclarationAST *ast)
bool CheckDeclaration::visit(TemplateDeclarationAST *ast)
{
Scope *previousScope = switchScope(new Scope(_scope->owner()));
Scope *scope = new Scope(_scope->owner());
for (DeclarationListAST *param = ast->template_parameters; param; param = param->next) {
semantic()->check(param->declaration, _scope);
semantic()->check(param->declaration, scope);
}
Scope *templateParameters = switchScope(previousScope);
semantic()->check(ast->declaration, _scope, templateParameters);
semantic()->check(ast->declaration, _scope,
new TemplateParameters(_templateParameters, scope));
return false;
}