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

10
include/swift/AST/Attr.h
View File

@@ -862,15 +862,15 @@ public:
class AbstractAccessibilityAttr : public DeclAttribute {
protected:
AbstractAccessibilityAttr(DeclAttrKind DK, SourceLoc atLoc, SourceRange range,
Accessibility access, bool implicit)
AccessLevel access, bool implicit)
: DeclAttribute(DK, atLoc, range, implicit) {
AccessibilityAttrBits.AccessLevel = static_cast<unsigned>(access);
assert(getAccess() == access && "not enough bits for accessibility");
}
public:
Accessibility getAccess() const {
return static_cast<Accessibility>(AccessibilityAttrBits.AccessLevel);
AccessLevel getAccess() const {
return static_cast<AccessLevel>(AccessibilityAttrBits.AccessLevel);
}
static bool classof(const DeclAttribute *DA) {
@@ -882,7 +882,7 @@ public:
/// Represents a 'private', 'internal', or 'public' marker on a declaration.
class AccessibilityAttr : public AbstractAccessibilityAttr {
public:
AccessibilityAttr(SourceLoc atLoc, SourceRange range, Accessibility access,
AccessibilityAttr(SourceLoc atLoc, SourceRange range, AccessLevel access,
bool implicit = false)
: AbstractAccessibilityAttr(DAK_Accessibility, atLoc, range, access,
implicit) {}
@@ -897,7 +897,7 @@ public:
class SetterAccessibilityAttr : public AbstractAccessibilityAttr {
public:
SetterAccessibilityAttr(SourceLoc atLoc, SourceRange range,
Accessibility access, bool implicit = false)
AccessLevel access, bool implicit = false)
: AbstractAccessibilityAttr(DAK_SetterAccessibility, atLoc, range, access,
implicit) {}