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

AST: Introduce ProtocolDecl::get{AssociatedType,ProtocolRequirement}()

Browse Source
This commit is contained in:
Slava Pestov
2019-08-29 22:04:38 -04:00
parent 7f6ef1e12d
commit 22cb6f1176
20 changed files with 114 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/Sema/CSGen.cpp
View File

@@ -1184,14 +1184,13 @@ namespace {
locator);
if (auto appendingExpr = expr->getAppendingExpr()) {
auto associatedTypeArray =
interpolationProto->lookupDirect(tc.Context.Id_StringInterpolation);
if (associatedTypeArray.empty()) {
auto associatedTypeDecl = interpolationProto->getAssociatedType(
tc.Context.Id_StringInterpolation);
if (associatedTypeDecl == nullptr) {
tc.diagnose(expr->getStartLoc(), diag::interpolation_broken_proto);
return nullptr;
}
auto associatedTypeDecl =
cast<AssociatedTypeDecl>(associatedTypeArray.front());
auto interpolationTV = DependentMemberType::get(tv, associatedTypeDecl);
auto appendingExprType = CS.getType(appendingExpr);
@@ -1261,12 +1260,12 @@ namespace {
// use the right labels before forming the call to the initializer.
DeclName constrName = tc.getObjectLiteralConstructorName(expr);
assert(constrName);
auto constrs = protocol->lookupDirect(constrName);
if (constrs.size() != 1 || !isa<ConstructorDecl>(constrs.front())) {
auto *constr = dyn_cast_or_null<ConstructorDecl>(
protocol->getSingleRequirement(constrName));
if (!constr) {
tc.diagnose(protocol, diag::object_literal_broken_proto);
return nullptr;
}
auto *constr = cast<ConstructorDecl>(constrs.front());
auto constrParamType = tc.getObjectLiteralParameterType(expr, constr);
// Extract the arguments.
@@ -1850,12 +1849,8 @@ namespace {
}
// FIXME: Protect against broken standard library.
auto keyAssocTy = cast<AssociatedTypeDecl>(
dictionaryProto->lookupDirect(
C.getIdentifier("Key")).front());
auto valueAssocTy = cast<AssociatedTypeDecl>(
dictionaryProto->lookupDirect(
C.getIdentifier("Value")).front());
auto keyAssocTy = dictionaryProto->getAssociatedType(C.Id_Key);
auto valueAssocTy = dictionaryProto->getAssociatedType(C.Id_Value);
auto locator = CS.getConstraintLocator(expr);
auto contextualType = CS.getContextualType(expr);