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 (3/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.

Rename AccessibilityAttr to AccessControlAttr and
SetterAccessibilityAttr to SetterAccessAttr, then track down the last
few uses of "accessibility" that don't have to do with
NSAccessibility. (I left the SourceKit XPC API alone because that's
supposed to be more stable.)
This commit is contained in:
Jordan Rose
2017-08-28 13:27:59 -07:00
parent 1c651973c3
commit 449cd98997
44 changed files with 209 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/AST/DeclContext.cpp
View File

@@ -583,7 +583,7 @@ bool DeclContext::isInnermostContextGeneric() const {
bool
DeclContext::isCascadingContextForLookup(bool functionsAreNonCascading) const {
// FIXME: This is explicitly checking for attributes in some cases because
// it can be called before accessibility is computed.
// it can be called before access control is computed.
switch (getContextKind()) {
case DeclContextKind::AbstractClosureExpr:
break;
@@ -633,7 +633,7 @@ DeclContext::isCascadingContextForLookup(bool functionsAreNonCascading) const {
if (extension->hasDefaultAccessLevel())
return extension->getDefaultAccessLevel() > AccessLevel::FilePrivate;
// FIXME: duplicated from computeDefaultAccessLevel in TypeCheckDecl.cpp.
if (auto *AA = extension->getAttrs().getAttribute<AccessibilityAttr>())
if (auto *AA = extension->getAttrs().getAttribute<AccessControlAttr>())
return AA->getAccess() > AccessLevel::FilePrivate;
if (Type extendedTy = extension->getExtendedType()) {