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

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

16
lib/AST/NameLookup.cpp
View File

@@ -348,7 +348,7 @@ enum class DiscriminatorMatch {
static DiscriminatorMatch matchDiscriminator(Identifier discriminator,
const ValueDecl *value) {
if (value->getFormalAccess() > Accessibility::FilePrivate)
if (value->getFormalAccess() > AccessLevel::FilePrivate)
return DiscriminatorMatch::NoDiscriminator;
auto containingFile =
@@ -1284,18 +1284,18 @@ void ClassDecl::recordObjCMethod(AbstractFunctionDecl *method) {
}
static bool checkAccess(const DeclContext *useDC, const DeclContext *sourceDC,
Accessibility access) {
AccessLevel access) {
if (!useDC)
return access >= Accessibility::Public;
return access >= AccessLevel::Public;
assert(sourceDC && "ValueDecl being accessed must have a valid DeclContext");
switch (access) {
case Accessibility::Private:
case AccessLevel::Private:
return (useDC == sourceDC ||
AccessScope::allowsPrivateAccess(useDC, sourceDC));
case Accessibility::FilePrivate:
case AccessLevel::FilePrivate:
return useDC->getModuleScopeContext() == sourceDC->getModuleScopeContext();
case Accessibility::Internal: {
case AccessLevel::Internal: {
const ModuleDecl *sourceModule = sourceDC->getParentModule();
const DeclContext *useFile = useDC->getModuleScopeContext();
if (useFile->getParentModule() == sourceModule)
@@ -1305,8 +1305,8 @@ static bool checkAccess(const DeclContext *useDC, const DeclContext *sourceDC,
return true;
return false;
}
case Accessibility::Public:
case Accessibility::Open:
case AccessLevel::Public:
case AccessLevel::Open:
return true;
}
llvm_unreachable("bad Accessibility");