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

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

@@ -206,19 +206,19 @@ protected:
enum { NumObjCAttrBits = NumDeclAttrBits + 3 };
static_assert(NumObjCAttrBits <= 32, "fits in an unsigned");
class AccessibilityAttrBitFields {
friend class AbstractAccessibilityAttr;
class AccessControlAttrBitFields {
friend class AbstractAccessControlAttr;
unsigned : NumDeclAttrBits;
unsigned AccessLevel : 3;
};
enum { NumAccessibilityAttrBits = NumDeclAttrBits + 3 };
static_assert(NumAccessibilityAttrBits <= 32, "fits in an unsigned");
enum { NumAccessControlAttrBits = NumDeclAttrBits + 3 };
static_assert(NumAccessControlAttrBits <= 32, "fits in an unsigned");
union {
DeclAttrBitFields DeclAttrBits;
ObjCAttrBitFields ObjCAttrBits;
AccessibilityAttrBitFields AccessibilityAttrBits;
AccessControlAttrBitFields AccessControlAttrBits;
};
DeclAttribute *Next = nullptr;
@@ -858,51 +858,51 @@ public:
}
};
/// Represents any sort of accessibility modifier.
class AbstractAccessibilityAttr : public DeclAttribute {
/// Represents any sort of access control modifier.
class AbstractAccessControlAttr : public DeclAttribute {
protected:
AbstractAccessibilityAttr(DeclAttrKind DK, SourceLoc atLoc, SourceRange range,
AbstractAccessControlAttr(DeclAttrKind DK, SourceLoc atLoc, SourceRange range,
AccessLevel access, bool implicit)
: DeclAttribute(DK, atLoc, range, implicit) {
AccessibilityAttrBits.AccessLevel = static_cast<unsigned>(access);
assert(getAccess() == access && "not enough bits for accessibility");
AccessControlAttrBits.AccessLevel = static_cast<unsigned>(access);
assert(getAccess() == access && "not enough bits for access control");
}
public:
AccessLevel getAccess() const {
return static_cast<AccessLevel>(AccessibilityAttrBits.AccessLevel);
return static_cast<AccessLevel>(AccessControlAttrBits.AccessLevel);
}
static bool classof(const DeclAttribute *DA) {
return DA->getKind() == DAK_Accessibility ||
DA->getKind() == DAK_SetterAccessibility;
return DA->getKind() == DAK_AccessControl ||
DA->getKind() == DAK_SetterAccess;
}
};
/// Represents a 'private', 'internal', or 'public' marker on a declaration.
class AccessibilityAttr : public AbstractAccessibilityAttr {
class AccessControlAttr : public AbstractAccessControlAttr {
public:
AccessibilityAttr(SourceLoc atLoc, SourceRange range, AccessLevel access,
AccessControlAttr(SourceLoc atLoc, SourceRange range, AccessLevel access,
bool implicit = false)
: AbstractAccessibilityAttr(DAK_Accessibility, atLoc, range, access,
: AbstractAccessControlAttr(DAK_AccessControl, atLoc, range, access,
implicit) {}
static bool classof(const DeclAttribute *DA) {
return DA->getKind() == DAK_Accessibility;
return DA->getKind() == DAK_AccessControl;
}
};
/// Represents a 'private', 'internal', or 'public' marker for a setter on a
/// declaration.
class SetterAccessibilityAttr : public AbstractAccessibilityAttr {
class SetterAccessAttr : public AbstractAccessControlAttr {
public:
SetterAccessibilityAttr(SourceLoc atLoc, SourceRange range,
SetterAccessAttr(SourceLoc atLoc, SourceRange range,
AccessLevel access, bool implicit = false)
: AbstractAccessibilityAttr(DAK_SetterAccessibility, atLoc, range, access,
: AbstractAccessControlAttr(DAK_SetterAccess, atLoc, range, access,
implicit) {}
static bool classof(const DeclAttribute *DA) {
return DA->getKind() == DAK_SetterAccessibility;
return DA->getKind() == DAK_SetterAccess;
}
};