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

[NFC] AST-level support for static subscripts

Browse Source 
* Moves the IsStatic flag from VarDecl to AbstractStorageDecl.
* Adds a StaticSubscriptKind to SubscriptDecl.
* Updates serialization for these changes.
* Updates SubscriptDecl constructor call sites for these changes.
This commit is contained in:
Brent Royal-Gordon
2019-03-16 16:13:45 -07:00
committed by Brent Royal-Gordon
parent 94f770672a
commit 972eda2316
7 changed files with 76 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Serialization/Deserialization.cpp
View File

@@ -3536,7 +3536,7 @@ public:
TypeID elemInterfaceTypeID;
ModuleFile::AccessorRecord accessors;
DeclID overriddenID;
uint8_t rawAccessLevel, rawSetterAccessLevel;
uint8_t rawAccessLevel, rawSetterAccessLevel, rawStaticSpelling;
uint8_t opaqueReadOwnership, readImpl, writeImpl, readWriteImpl;
unsigned numArgNames, numAccessors;
ArrayRef<uint64_t> argNameAndDependencyIDs;
@@ -3550,7 +3550,8 @@ public:
genericEnvID,
elemInterfaceTypeID,
overriddenID, rawAccessLevel,
rawSetterAccessLevel, numArgNames,
rawSetterAccessLevel,
rawStaticSpelling, numArgNames,
argNameAndDependencyIDs);
// Resolve the name ids.
SmallVector<Identifier, 2> argNames;
@@ -3586,8 +3587,16 @@ public:
auto *genericParams = MF.maybeReadGenericParams(parent);
if (declOrOffset.isComplete())
return declOrOffset;
auto staticSpelling = getActualStaticSpellingKind(rawStaticSpelling);
if (!staticSpelling.hasValue()) {
MF.error();
return nullptr;
}
auto subscript = MF.createDecl<SubscriptDecl>(name, SourceLoc(), nullptr,
auto subscript = MF.createDecl<SubscriptDecl>(name,
SourceLoc(), *staticSpelling,
SourceLoc(), nullptr,
SourceLoc(), TypeLoc(),
parent, genericParams);
subscript->setIsGetterMutating(isGetterMutating);