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/ASTPrinter.cpp
View File

@@ -429,23 +429,23 @@ class PrintAST : public ASTVisitor<PrintAST> {
}
}
void printAccess(Accessibility access, StringRef suffix = "") {
void printAccess(AccessLevel access, StringRef suffix = "") {
switch (access) {
case Accessibility::Private:
case AccessLevel::Private:
Printer << tok::kw_private;
break;
case Accessibility::FilePrivate:
case AccessLevel::FilePrivate:
Printer << tok::kw_fileprivate;
break;
case Accessibility::Internal:
case AccessLevel::Internal:
if (!Options.PrintInternalAccessKeyword)
return;
Printer << tok::kw_internal;
break;
case Accessibility::Public:
case AccessLevel::Public:
Printer << tok::kw_public;
break;
case Accessibility::Open:
case AccessLevel::Open:
Printer.printKeyword("open");
break;
}
@@ -461,7 +461,7 @@ class PrintAST : public ASTVisitor<PrintAST> {
if (auto storageDecl = dyn_cast<AbstractStorageDecl>(D)) {
if (auto setter = storageDecl->getSetter()) {
Accessibility setterAccess = setter->getFormalAccess();
AccessLevel setterAccess = setter->getFormalAccess();
if (setterAccess != D->getFormalAccess())
printAccess(setterAccess, "(set)");
}
@@ -1266,7 +1266,7 @@ bool ShouldPrintChecker::shouldPrint(const Decl *D, PrintOptions &Options) {
// Skip declarations that are not accessible.
if (auto *VD = dyn_cast<ValueDecl>(D)) {
if (Options.AccessFilter > Accessibility::Private &&
if (Options.AccessFilter > AccessLevel::Private &&
VD->hasAccess() && VD->getFormalAccess() < Options.AccessFilter)
return false;
}