averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make AbstractFunctionDecl a DeclContext

Browse Source 
and remove DeclContext base class from FuncDecl, ConstructorDecl and
DestructorDecl

This decreases the number of DeclContexts to 7 and allows us to apply
alignas(8) to DeclContext.


Swift SVN r8186
This commit is contained in:
Dmitri Hrybenko
2013-09-13 03:38:33 +00:00
parent 16ce358562
commit 45e654fbaa
15 changed files with 151 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/IDE/CodeCompletion.cpp
View File

@@ -364,7 +364,8 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
// Type check the function that contains the expression.
if (CurDeclContext->getContextKind() == DeclContextKind::PipeClosureExpr ||
CurDeclContext->getContextKind() == DeclContextKind::ClosureExpr ||
CurDeclContext->getContextKind() == DeclContextKind::FuncDecl) {
CurDeclContext->getContextKind() ==
DeclContextKind::AbstractFunctionDecl) {
SourceLoc EndTypeCheckLoc =
ParsedExpr ? ParsedExpr->getStartLoc()
: TU->Ctx.SourceMgr.getCodeCompletionLoc();
@@ -373,11 +374,12 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
// For now, just find the nearest outer function.
DeclContext *DCToTypeCheck = CurDeclContext;
while (!DCToTypeCheck->isModuleContext() &&
!isa<FuncDecl>(DCToTypeCheck))
!isa<AbstractFunctionDecl>(DCToTypeCheck))
DCToTypeCheck = DCToTypeCheck->getParent();
if (auto *FD = dyn_cast<FuncDecl>(DCToTypeCheck))
return typeCheckFunctionBodyUntil(TU, CurDeclContext, FD,
EndTypeCheckLoc);
if (auto *AFD = dyn_cast<AbstractFunctionDecl>(DCToTypeCheck))
if (auto *FD = dyn_cast<FuncDecl>(AFD))
return typeCheckFunctionBodyUntil(TU, CurDeclContext, FD,
EndTypeCheckLoc);
return false;
}
if (CurDeclContext->getContextKind() == DeclContextKind::NominalTypeDecl) {
@@ -521,10 +523,11 @@ public:
break;
FunctionDC = Parent;
}
if (auto *FD = dyn_cast<FuncDecl>(FunctionDC)) {
if (FD->getDeclContext()->isTypeContext()) {
if (auto *AFD = dyn_cast<AbstractFunctionDecl>(FunctionDC)) {
if (AFD->getExtensionType()) {
CurrMethodDC = FunctionDC;
InsideStaticMethod = FD->isStatic();
if (auto *FD = dyn_cast<FuncDecl>(AFD))
InsideStaticMethod = FD->isStatic();
}
}
}
@@ -694,8 +697,10 @@ public:
CompletionContext,
CodeCompletionResult::ResultKind::Declaration);
Builder.setAssociatedDecl(CD);
if (IsSuperRefExpr && isa<ConstructorDecl>(CurrDeclContext)) {
Builder.addTextChunk("constructor");
if (IsSuperRefExpr) {
if (auto *AFD = dyn_cast<AbstractFunctionDecl>(CurrDeclContext))
if (isa<ConstructorDecl>(AFD))
Builder.addTextChunk("constructor");
}
Builder.addLeftParen();
addPatternParameters(Builder, CD->getArguments());
@@ -845,8 +850,11 @@ public:
if (auto *CD = dyn_cast<ConstructorDecl>(D)) {
if (!ExprType->is<MetaTypeType>())
return;
if (IsSuperRefExpr && !isa<ConstructorDecl>(CurrDeclContext))
return;
if (IsSuperRefExpr) {
if (auto *AFD = dyn_cast<AbstractFunctionDecl>(CurrDeclContext))
if (!isa<ConstructorDecl>(AFD))
return;
}
addConstructorCall(CD);
return;
}