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

Merge remote-tracking branch 'origin/master' into swift-3-api-guidelines

Browse Source
This commit is contained in:
Max Moiseev
2016-03-07 12:10:47 -08:00
parent 43a5d4cf55 3d424b5e96
commit 7fe6916bf6
178 changed files with 3421 additions and 1976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/DerivedConformanceErrorProtocol.cpp
View File

@@ -189,18 +189,21 @@ static void deriveBodyBridgedNSError_enum_nsErrorDomain(
// enum SomeEnum {
// @derived
// static var _nsErrorDomain: String {
// return "\(self)"
// return "ModuleName.SomeEnum"
// }
// }
auto &C = domainDecl->getASTContext();
auto M = domainDecl->getParentModule();
auto &C = M->getASTContext();
auto TC = domainDecl->getInnermostTypeContext();
auto ED = TC->getAsEnumOrEnumExtensionContext();
auto selfRef = createSelfDeclRef(domainDecl);
Expr *segmentElts[] = { selfRef };
auto segments = C.AllocateCopy(segmentElts);
auto string = new (C) InterpolatedStringLiteralExpr(SourceLoc(), segments);
string->setImplicit();
std::string buffer = M->getNameStr();
buffer += ".";
buffer += ED->getNameStr();
StringRef value(C.AllocateCopy(buffer));
auto string = new (C) StringLiteralExpr(value, SourceRange(), /*implicit*/ true);
auto ret = new (C) ReturnStmt(SourceLoc(), string, /*implicit*/ true);
auto body = BraceStmt::create(C, SourceLoc(),
ASTNode(ret),