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

Rename accessor kinds from IsGetter -> IsGet, etc.

Browse Source 
Introduce some metaprogramming of accessors and generally prepare
for storing less-structured accessor lists.

NFC except for a change to the serialization format.
This commit is contained in:
John McCall
2018-06-14 15:40:16 -04:00
parent aea6f069bb
commit 9022b5152f
38 changed files with 748 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Sema/CodeSynthesis.cpp
View File

@@ -160,7 +160,7 @@ static AccessorDecl *createGetterPrototype(AbstractStorageDecl *storage,
auto getter = AccessorDecl::create(
TC.Context, loc, /*AccessorKeywordLoc*/ loc,
AccessorKind::IsGetter, AddressorKind::NotAddressor, storage,
AccessorKind::Get, AddressorKind::NotAddressor, storage,
staticLoc, StaticSpellingKind::None,
/*Throws=*/false, /*ThrowsLoc=*/SourceLoc(),
/*GenericParams=*/nullptr,
@@ -211,7 +211,7 @@ static AccessorDecl *createSetterPrototype(AbstractStorageDecl *storage,
Type setterRetTy = TupleType::getEmpty(TC.Context);
auto setter = AccessorDecl::create(
TC.Context, loc, /*AccessorKeywordLoc*/ SourceLoc(),
AccessorKind::IsSetter, AddressorKind::NotAddressor, storage,
AccessorKind::Set, AddressorKind::NotAddressor, storage,
/*StaticLoc=*/SourceLoc(), StaticSpellingKind::None,
/*Throws=*/false, /*ThrowsLoc=*/SourceLoc(),
/*GenericParams=*/nullptr, params, TypeLoc::withoutLoc(setterRetTy),
@@ -328,7 +328,7 @@ createMaterializeForSetPrototype(AbstractStorageDecl *storage,
auto *materializeForSet = AccessorDecl::create(
ctx, loc, /*AccessorKeywordLoc=*/SourceLoc(),
AccessorKind::IsMaterializeForSet, AddressorKind::NotAddressor, storage,
AccessorKind::MaterializeForSet, AddressorKind::NotAddressor, storage,
/*StaticLoc=*/SourceLoc(), StaticSpellingKind::None,
/*Throws=*/false, /*ThrowsLoc=*/SourceLoc(),
(genericParams
@@ -453,11 +453,11 @@ static Expr *buildSubscriptIndexReference(ASTContext &ctx,
auto accessorKind = accessor->getAccessorKind();
// Ignore the value/buffer parameter.
if (accessorKind != AccessorKind::IsGetter)
if (accessorKind != AccessorKind::Get)
params = params.slice(1);
// Ignore the materializeForSet callback storage parameter.
if (accessorKind == AccessorKind::IsMaterializeForSet)
if (accessorKind == AccessorKind::MaterializeForSet)
params = params.slice(1);
// Okay, everything else should be forwarded, build the expression.