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

Start parsing 'throws' on initializers.

Browse Source 
Introduce basic validation for throwing @objc initializers, e.g., a
failable @objc initializer cannot also be throwing. However,
Objective-C selector computation is broken.

Swift SVN r27292
This commit is contained in:
Doug Gregor
2015-04-14 22:52:29 +00:00
parent 2d985c0a5d
commit 41ae48b22e
14 changed files with 96 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Sema/CodeSynthesis.cpp
View File

@@ -1941,7 +1941,7 @@ ConstructorDecl *swift::createImplicitConstructor(TypeChecker &tc,
Pattern *selfPat = buildImplicitSelfParameter(Loc, decl);
auto *ctor = new (context) ConstructorDecl(name, Loc, OTK_None, SourceLoc(),
selfPat, pattern,
nullptr, decl);
nullptr, SourceLoc(), decl);
// Mark implicit.
ctor->setImplicit();
@@ -2197,7 +2197,7 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
superclassCtor->getFailability(),
SourceLoc(),
selfBodyPattern, bodyParamPatterns,
nullptr, classDecl);
nullptr, SourceLoc(), classDecl);
ctor->setImplicit();
ctor->setAccessibility(std::min(classDecl->getFormalAccess(),
superclassCtor->getFormalAccess()));
@@ -2215,9 +2215,11 @@ swift::createDesignatedInitOverride(TypeChecker &tc,
// Set the type of the initializer.
configureConstructorType(ctor, outerGenericParams, selfType,
bodyParamPatterns->getType());
bodyParamPatterns->getType(),
superclassCtor->isBodyThrowing());
if (superclassCtor->isObjC()) {
markAsObjC(tc, ctor, true);
auto errorConvention = superclassCtor->getForeignErrorConvention();
markAsObjC(tc, ctor, true, errorConvention);
// Inherit the @objc name from the superclass initializer, if it
// has one.