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

Distinguish conformance and superclass generic requirements.

Browse Source 
As part of this, use a different enum for parsed generic requirements.

NFC except that I noticed that ASTWalker wasn't visiting the second
type in a conformance constraint; fixing this seems to have no effect
beyond producing better IDE annotations.
This commit is contained in:
John McCall
2016-01-11 16:02:48 -08:00
parent 0b8468d36b
commit 1f3b3142b4
25 changed files with 246 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Serialization/Deserialization.cpp
View File

@@ -769,7 +769,7 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
auto subject = TypeLoc::withoutLoc(getType(rawTypeIDs[0]));
auto constraint = TypeLoc::withoutLoc(getType(rawTypeIDs[1]));
requirements.push_back(RequirementRepr::getConformance(subject,
requirements.push_back(RequirementRepr::getTypeConstraint(subject,
SourceLoc(),
constraint));
break;
@@ -784,6 +784,7 @@ GenericParamList *ModuleFile::maybeReadGenericParams(DeclContext *DC,
break;
}
case GenericRequirementKind::Superclass:
case WitnessMarker: {
// Shouldn't happen where we have requirement representations.
error();
@@ -866,6 +867,14 @@ void ModuleFile::readGenericRequirements(
subject, constraint));
break;
}
case GenericRequirementKind::Superclass: {
auto subject = getType(rawTypeIDs[0]);
auto constraint = getType(rawTypeIDs[1]);
requirements.push_back(Requirement(RequirementKind::Superclass,
subject, constraint));
break;
}
case GenericRequirementKind::SameType: {
auto first = getType(rawTypeIDs[0]);
auto second = getType(rawTypeIDs[1]);