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

12
lib/SIL/DynamicCasts.cpp
View File

@@ -58,12 +58,12 @@ static bool canClassOrSuperclassesHaveExtensions(ClassDecl *CD,
bool isWholeModuleOpts) {
while (CD) {
// Open classes can always be extended
if (CD->getEffectiveAccess() == Accessibility::Open)
if (CD->getEffectiveAccess() == AccessLevel::Open)
return true;
// Internal and public classes can be extended, if we are not in
// whole-module-optimization mode.
if (CD->getEffectiveAccess() >= Accessibility::Internal &&
if (CD->getEffectiveAccess() >= AccessLevel::Internal &&
!isWholeModuleOpts)
return true;
@@ -144,8 +144,8 @@ classifyDynamicCastToProtocol(CanType source,
// then conformances cannot be changed at run-time, because only this
// file could have implemented them, but no conformances were found.
// Therefore it is safe to make a negative decision at compile-time.
if (SourceNominalTy->getEffectiveAccess() <= Accessibility::FilePrivate ||
TargetProtocol->getEffectiveAccess() <= Accessibility::FilePrivate) {
if (SourceNominalTy->getEffectiveAccess() <= AccessLevel::FilePrivate ||
TargetProtocol->getEffectiveAccess() <= AccessLevel::FilePrivate) {
// This cast is always false. Replace it with a branch to the
// failure block.
return DynamicCastFeasibility::WillFail;
@@ -157,8 +157,8 @@ classifyDynamicCastToProtocol(CanType source,
// module could have implemented them, but no conformances were found.
// Therefore it is safe to make a negative decision at compile-time.
if (isWholeModuleOpts &&
(SourceNominalTy->getEffectiveAccess() <= Accessibility::Internal ||
TargetProtocol->getEffectiveAccess() <= Accessibility::Internal)) {
(SourceNominalTy->getEffectiveAccess() <= AccessLevel::Internal ||
TargetProtocol->getEffectiveAccess() <= AccessLevel::Internal)) {
return DynamicCastFeasibility::WillFail;
}