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

Move the DeclContext base class from FuncExpr to FuncDecl

Browse Source 
FuncDecl still has a FuncExpr because capture list is stored in FuncExpr
(which is a CapturingExpr).


Swift SVN r8179
This commit is contained in:
Dmitri Hrybenko
2013-09-13 01:40:41 +00:00
parent 63ecd5c9d1
commit 0d6d9a0ffb
27 changed files with 208 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/IDE/CodeCompletion.cpp
View File

@@ -362,9 +362,9 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
/// \returns true on success, false on failure.
bool typecheckContext() {
// Type check the function that contains the expression.
if (CurDeclContext->getContextKind() == DeclContextKind::FuncExpr ||
CurDeclContext->getContextKind() == DeclContextKind::PipeClosureExpr ||
CurDeclContext->getContextKind() == DeclContextKind::ClosureExpr) {
if (CurDeclContext->getContextKind() == DeclContextKind::PipeClosureExpr ||
CurDeclContext->getContextKind() == DeclContextKind::ClosureExpr ||
CurDeclContext->getContextKind() == DeclContextKind::FuncDecl) {
SourceLoc EndTypeCheckLoc =
ParsedExpr ? ParsedExpr->getStartLoc()
: TU->Ctx.SourceMgr.getCodeCompletionLoc();
@@ -373,10 +373,10 @@ class CodeCompletionCallbacksImpl : public CodeCompletionCallbacks,
// For now, just find the nearest outer function.
DeclContext *DCToTypeCheck = CurDeclContext;
while (!DCToTypeCheck->isModuleContext() &&
!isa<FuncExpr>(DCToTypeCheck))
!isa<FuncDecl>(DCToTypeCheck))
DCToTypeCheck = DCToTypeCheck->getParent();
if (auto *FE = dyn_cast<FuncExpr>(DCToTypeCheck))
return typeCheckFunctionBodyUntil(TU, CurDeclContext, FE->getDecl(),
if (auto *FD = dyn_cast<FuncDecl>(DCToTypeCheck))
return typeCheckFunctionBodyUntil(TU, CurDeclContext, FD,
EndTypeCheckLoc);
return false;
}
@@ -521,8 +521,7 @@ public:
break;
FunctionDC = Parent;
}
if (auto *FE = dyn_cast<FuncExpr>(FunctionDC)) {
auto *FD = FE->getDecl();
if (auto *FD = dyn_cast<FuncDecl>(FunctionDC)) {
if (FD->getDeclContext()->isTypeContext()) {
CurrMethodDC = FunctionDC;
InsideStaticMethod = FD->isStatic();
@@ -1072,7 +1071,7 @@ void CodeCompletionCallbacksImpl::doneParsing() {
return;
if (auto *FD = dyn_cast_or_null<FuncDecl>(DelayedParsedDecl))
CurDeclContext = FD->getFuncExpr();
CurDeclContext = FD;
if (ParsedExpr && !typecheckParsedExpr())
return;