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

Simplify parsing and representation of extension declarations.

Browse Source 
Now that we don't have generic parameter lists at arbitrary positions
within the extended type of an extension declaration, simplify the
representation of the extended type down to a TypeLoc along with a
(compiler-synthesized) generic parameter list.

On the parsing side, just parse a type for the extended type, rather
than having a special grammar. We still reject anything that is not a
nominal type (of course), but it's simpler just to call it a type.

As a drive-by, fix the crasher when extending a type with module
qualification, rdar://problem/20900870.

Swift SVN r28469
This commit is contained in:
Doug Gregor
2015-05-12 16:26:13 +00:00
parent 985896905e
commit 340e4d8f8a
17 changed files with 185 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/Serialization/Serialization.cpp
View File

@@ -1943,19 +1943,16 @@ void Serializer::writeDecl(const Decl *D) {
// parameters.
(void)addDeclRef(baseTy->getAnyNominal());
SmallVector<DeclID, 8> protocolsAndRefTypes;
SmallVector<DeclID, 8> protocols;
for (auto proto : extension->getLocalProtocols())
protocolsAndRefTypes.push_back(addDeclRef(proto));
for (const auto &ref : extension->getRefComponents())
protocolsAndRefTypes.push_back(addTypeRef(ref.IdentType.getType()));
protocols.push_back(addDeclRef(proto));
unsigned abbrCode = DeclTypeAbbrCodes[ExtensionLayout::Code];
ExtensionLayout::emitRecord(Out, ScratchRecord, abbrCode,
addTypeRef(baseTy),
contextID,
extension->isImplicit(),
extension->getRefComponents().size(),
protocolsAndRefTypes);
protocols);
bool isClassExtension = false;
if (auto baseNominal = baseTy->getAnyNominal()) {
@@ -1963,9 +1960,7 @@ void Serializer::writeDecl(const Decl *D) {
isa<ProtocolDecl>(baseNominal);
}
for (const auto &ref : extension->getRefComponents())
writeGenericParams(ref.GenericParams, DeclTypeAbbrCodes);
writeGenericParams(extension->getGenericParams(), DeclTypeAbbrCodes);
writeRequirements(extension->getGenericRequirements());
writeMembers(extension->getMembers(), isClassExtension);
writeConformances(extension->getLocalConformances(),