averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Excise "Accessibility" from the compiler (2/3)

Browse Source 
"Accessibility" has a different meaning for app developers, so we've
already deliberately excised it from our diagnostics in favor of terms
like "access control" and "access level". Do the same in the compiler
now that we aren't constantly pulling things into the release branch.

This commit changes the 'Accessibility' enum to be named 'AccessLevel'.
This commit is contained in:
Jordan Rose
2017-08-17 16:01:45 -07:00
parent 5f30eac288
commit 1c651973c3
66 changed files with 493 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tools/SourceKit/lib/SwiftLang/SwiftEditor.cpp
View File

@@ -890,7 +890,7 @@ void SwiftEditorDocument::Implementation::buildSwiftInv(
namespace {
static UIdent getAccessLevelUID(Accessibility Access) {
static UIdent getAccessLevelUID(AccessLevel Access) {
static UIdent AccessOpen("source.lang.swift.accessibility.open");
static UIdent AccessPublic("source.lang.swift.accessibility.public");
static UIdent AccessInternal("source.lang.swift.accessibility.internal");
@@ -898,22 +898,22 @@ static UIdent getAccessLevelUID(Accessibility Access) {
static UIdent AccessPrivate("source.lang.swift.accessibility.private");
switch (Access) {
case Accessibility::Private:
case AccessLevel::Private:
return AccessPrivate;
case Accessibility::FilePrivate:
case AccessLevel::FilePrivate:
return AccessFilePrivate;
case Accessibility::Internal:
case AccessLevel::Internal:
return AccessInternal;
case Accessibility::Public:
case AccessLevel::Public:
return AccessPublic;
case Accessibility::Open:
case AccessLevel::Open:
return AccessOpen;
}
llvm_unreachable("Unhandled Accessibility in switch.");
}
static Optional<Accessibility> getAccessLevelStrictly(const ExtensionDecl *ED) {
static Optional<AccessLevel> getAccessLevelStrictly(const ExtensionDecl *ED) {
if (ED->hasDefaultAccessLevel())
return ED->getDefaultAccessLevel();
@@ -924,18 +924,18 @@ static Optional<Accessibility> getAccessLevelStrictly(const ExtensionDecl *ED) {
return None;
}
static Accessibility inferDefaultAccessLevel(const ExtensionDecl *ED) {
static AccessLevel inferDefaultAccessLevel(const ExtensionDecl *ED) {
if (auto StrictAccess = getAccessLevelStrictly(ED))
return StrictAccess.getValue();
// Assume "internal", which is the most common thing anyway.
return Accessibility::Internal;
return AccessLevel::Internal;
}
/// If typechecking was performed we use the computed accessibility, otherwise
/// we fallback to inferring accessibility syntactically. This may not be as
/// accurate but it's only until we have typechecked the AST.
static Accessibility inferAccessLevel(const ValueDecl *D) {
static AccessLevel inferAccessLevel(const ValueDecl *D) {
assert(D);
if (D->hasAccess())
return D->getFormalAccess();
@@ -952,15 +952,15 @@ static Accessibility inferAccessLevel(const ValueDecl *D) {
case DeclContextKind::TopLevelCodeDecl:
case DeclContextKind::AbstractFunctionDecl:
case DeclContextKind::SubscriptDecl:
return Accessibility::Private;
return AccessLevel::Private;
case DeclContextKind::Module:
case DeclContextKind::FileUnit:
return Accessibility::Internal;
return AccessLevel::Internal;
case DeclContextKind::GenericTypeDecl: {
auto Nominal = cast<GenericTypeDecl>(DC);
Accessibility Access = inferAccessLevel(Nominal);
AccessLevel Access = inferAccessLevel(Nominal);
if (!isa<ProtocolDecl>(Nominal))
Access = std::min(Access, Accessibility::Internal);
Access = std::min(Access, AccessLevel::Internal);
return Access;
}
case DeclContextKind::ExtensionDecl:
@@ -970,7 +970,7 @@ static Accessibility inferAccessLevel(const ValueDecl *D) {
llvm_unreachable("Unhandled DeclContextKind in switch.");
}
static Optional<Accessibility>
static Optional<AccessLevel>
inferSetterAccessLevel(const AbstractStorageDecl *D) {
if (auto *VD = dyn_cast<VarDecl>(D)) {
if (VD->isLet())
@@ -1049,7 +1049,7 @@ public:
AccessLevel = getAccessLevelUID(StrictAccess.getValue());
}
if (auto *ASD = dyn_cast_or_null<AbstractStorageDecl>(Node.Dcl)) {
Optional<Accessibility> SetAccess = inferSetterAccessLevel(ASD);
Optional<swift::AccessLevel> SetAccess = inferSetterAccessLevel(ASD);
if (SetAccess.hasValue()) {
SetterAccessLevel = getAccessLevelUID(SetAccess.getValue());
}