Skip to content

Commit 962e0bb

Browse files
author
Nathan Hawes
authored
Merge pull request swiftlang#32606 from nathawes/prefer-macOS-to-OSX-spelling-when-printing-platform
[AST] Prefer the 'macOS' spelling over 'OSX' when printing the platform kind.
2 parents 2bc97cf + 244dc4a commit 962e0bb

33 files changed

+218
-224
lines changed

‎include/swift/AST/PlatformKinds.def‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
AVAILABILITY_PLATFORM(iOS, "iOS")
2626
AVAILABILITY_PLATFORM(tvOS, "tvOS")
2727
AVAILABILITY_PLATFORM(watchOS, "watchOS")
28-
AVAILABILITY_PLATFORM(OSX, "macOS")
28+
AVAILABILITY_PLATFORM(macOS, "macOS")
2929
AVAILABILITY_PLATFORM(iOSApplicationExtension, "application extensions for iOS")
3030
AVAILABILITY_PLATFORM(tvOSApplicationExtension, "application extensions for tvOS")
3131
AVAILABILITY_PLATFORM(watchOSApplicationExtension, "application extensions for watchOS")
32-
AVAILABILITY_PLATFORM(OSXApplicationExtension, "application extensions for macOS")
32+
AVAILABILITY_PLATFORM(macOSApplicationExtension, "application extensions for macOS")
3333
AVAILABILITY_PLATFORM(macCatalyst, "Mac Catalyst")
3434
AVAILABILITY_PLATFORM(macCatalystApplicationExtension, "application extensions for Mac Catalyst")
3535

‎lib/AST/Availability.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ AvailabilityContext ASTContext::getSwift53Availability() {
358358
return AvailabilityContext::alwaysAvailable();
359359

360360
llvm::VersionTuple macOVersion53(10, 16, 0);
361-
macOVersion53 = canonicalizePlatformVersion(PlatformKind::OSX, macOVersion53);
361+
macOVersion53 = canonicalizePlatformVersion(PlatformKind::macOS, macOVersion53);
362362
return AvailabilityContext(
363363
VersionRange::allGTE(macOVersion53));
364364
} else if (target.isiOS()) {

‎lib/AST/PlatformKind.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ Optional<PlatformKind> swift::platformFromString(StringRef Name) {
5353
return llvm::StringSwitch<Optional<PlatformKind>>(Name)
5454
#define AVAILABILITY_PLATFORM(X, PrettyName) .Case(#X, PlatformKind::X)
5555
#include "swift/AST/PlatformKinds.def"
56-
.Case("macOS", PlatformKind::OSX)
57-
.Case("macOSApplicationExtension", PlatformKind::OSXApplicationExtension)
56+
.Case("OSX", PlatformKind::macOS)
57+
.Case("OSXApplicationExtension", PlatformKind::macOSApplicationExtension)
5858
.Default(Optional<PlatformKind>());
5959
}
6060

@@ -64,16 +64,16 @@ static bool isPlatformActiveForTarget(PlatformKind Platform,
6464
if (Platform == PlatformKind::none)
6565
return true;
6666

67-
if (Platform == PlatformKind::OSXApplicationExtension ||
67+
if (Platform == PlatformKind::macOSApplicationExtension ||
6868
Platform == PlatformKind::iOSApplicationExtension ||
6969
Platform == PlatformKind::macCatalystApplicationExtension)
7070
if (!EnableAppExtensionRestrictions)
7171
return false;
7272

7373
// FIXME: This is an awful way to get the current OS.
7474
switch (Platform) {
75-
case PlatformKind::OSX:
76-
case PlatformKind::OSXApplicationExtension:
75+
case PlatformKind::macOS:
76+
case PlatformKind::macOSApplicationExtension:
7777
return Target.isMacOSX();
7878
case PlatformKind::iOS:
7979
case PlatformKind::iOSApplicationExtension:
@@ -109,8 +109,8 @@ bool swift::isPlatformActive(PlatformKind Platform, const LangOptions &LangOpts,
109109
PlatformKind swift::targetPlatform(const LangOptions &LangOpts) {
110110
if (LangOpts.Target.isMacOSX()) {
111111
return (LangOpts.EnableAppExtensionRestrictions
112-
? PlatformKind::OSXApplicationExtension
113-
: PlatformKind::OSX);
112+
? PlatformKind::macOSApplicationExtension
113+
: PlatformKind::macOS);
114114
}
115115

116116
if (LangOpts.Target.isTvOS()) {
@@ -162,8 +162,8 @@ llvm::VersionTuple swift::canonicalizePlatformVersion(
162162

163163
// Canonicalize macOS version for macOS Big Sur to treat
164164
// 10.16 as 11.0.
165-
if (platform == PlatformKind::OSX ||
166-
platform == PlatformKind::OSXApplicationExtension) {
165+
if (platform == PlatformKind::macOS ||
166+
platform == PlatformKind::macOSApplicationExtension) {
167167
return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
168168
version);
169169
}

‎lib/ClangImporter/ClangImporter.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1903,8 +1903,8 @@ PlatformAvailability::PlatformAvailability(const LangOptions &langOpts)
19031903
deprecatedAsUnavailableMessage = "";
19041904
break;
19051905

1906-
case PlatformKind::OSX:
1907-
case PlatformKind::OSXApplicationExtension:
1906+
case PlatformKind::macOS:
1907+
case PlatformKind::macOSApplicationExtension:
19081908
deprecatedAsUnavailableMessage =
19091909
"APIs deprecated as of macOS 10.9 and earlier are unavailable in Swift";
19101910
break;
@@ -1916,9 +1916,9 @@ PlatformAvailability::PlatformAvailability(const LangOptions &langOpts)
19161916

19171917
bool PlatformAvailability::isPlatformRelevant(StringRef name) const {
19181918
switch (platformKind) {
1919-
case PlatformKind::OSX:
1919+
case PlatformKind::macOS:
19201920
return name == "macos";
1921-
case PlatformKind::OSXApplicationExtension:
1921+
case PlatformKind::macOSApplicationExtension:
19221922
return name == "macos" || name == "macos_app_extension";
19231923

19241924
case PlatformKind::iOS:
@@ -1958,8 +1958,8 @@ bool PlatformAvailability::treatDeprecatedAsUnavailable(
19581958
case PlatformKind::none:
19591959
llvm_unreachable("version but no platform?");
19601960

1961-
case PlatformKind::OSX:
1962-
case PlatformKind::OSXApplicationExtension:
1961+
case PlatformKind::macOS:
1962+
case PlatformKind::macOSApplicationExtension:
19631963
// Anything deprecated in OSX 10.9.x and earlier is unavailable in Swift.
19641964
return major < 10 ||
19651965
(major == 10 && (!minor.hasValue() || minor.getValue() <= 9));

‎lib/ClangImporter/ImportDecl.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7613,12 +7613,12 @@ void ClangImporter::Implementation::importAttributes(
76137613
auto platformK =
76147614
llvm::StringSwitch<Optional<PlatformKind>>(Platform)
76157615
.Case("ios", PlatformKind::iOS)
7616-
.Case("macos", PlatformKind::OSX)
7616+
.Case("macos", PlatformKind::macOS)
76177617
.Case("tvos", PlatformKind::tvOS)
76187618
.Case("watchos", PlatformKind::watchOS)
76197619
.Case("ios_app_extension", PlatformKind::iOSApplicationExtension)
76207620
.Case("macos_app_extension",
7621-
PlatformKind::OSXApplicationExtension)
7621+
PlatformKind::macOSApplicationExtension)
76227622
.Case("tvos_app_extension",
76237623
PlatformKind::tvOSApplicationExtension)
76247624
.Case("watchos_app_extension",

‎lib/Driver/DarwinToolChains.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
619619
// The first deployment of arm64 for macOS is version 10.16;
620620
if (triple.isAArch64() && major <= 10 && minor < 16) {
621621
llvm::VersionTuple firstMacARM64e(10, 16, 0);
622-
firstMacARM64e = canonicalizePlatformVersion(PlatformKind::OSX,
622+
firstMacARM64e = canonicalizePlatformVersion(PlatformKind::macOS,
623623
firstMacARM64e);
624624
major = firstMacARM64e.getMajor();
625625
minor = firstMacARM64e.getMinor().getValueOr(0);

‎lib/IDE/CodeCompletion.cpp‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4429,14 +4429,9 @@ class CompletionLookup final : public swift::VisibleDeclConsumer {
44294429
if (ParamIndex == 0) {
44304430
addDeclAttrParamKeyword("*", "Platform", false);
44314431

4432-
// For code completion, suggest 'macOS' instead of 'OSX'.
44334432
#define AVAILABILITY_PLATFORM(X, PrettyName) \
4434-
if (StringRef(#X) == "OSX") \
4435-
addDeclAttrParamKeyword("macOS", "Platform", false); \
4436-
else if (StringRef(#X) == "OSXApplicationExtension") \
4437-
addDeclAttrParamKeyword("macOSApplicationExtension", "Platform", false); \
4438-
else \
4439-
addDeclAttrParamKeyword(#X, "Platform", false);
4433+
addDeclAttrParamKeyword(swift::platformString(PlatformKind::X), \
4434+
"Platform", false);
44404435
#include "swift/AST/PlatformKinds.def"
44414436

44424437
} else {

‎lib/Parse/ParseStmt.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,10 +1350,9 @@ Parser::parseAvailabilitySpecList(SmallVectorImpl<AvailabilitySpec *> &Specs) {
13501350
auto *PlatformSpec =
13511351
cast<PlatformVersionConstraintAvailabilitySpec>(Previous);
13521352

1353-
auto PlatformName = platformString(PlatformSpec->getPlatform());
13541353
auto PlatformNameEndLoc =
1355-
PlatformSpec->getPlatformLoc().getAdvancedLoc(
1356-
PlatformName.size());
1354+
Lexer::getLocForEndOfToken(SourceManager,
1355+
PlatformSpec->getPlatformLoc());
13571356

13581357
diagnose(PlatformSpec->getPlatformLoc(),
13591358
diag::avail_query_meant_introduced)

‎lib/PrintAsObjC/DeclAndTypePrinter.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ class DeclAndTypePrinter::Implementation
821821

822822
const char *plat;
823823
switch (AvAttr->Platform) {
824-
case PlatformKind::OSX:
824+
case PlatformKind::macOS:
825825
plat = "macos";
826826
break;
827827
case PlatformKind::iOS:
@@ -836,7 +836,7 @@ class DeclAndTypePrinter::Implementation
836836
case PlatformKind::watchOS:
837837
plat = "watchos";
838838
break;
839-
case PlatformKind::OSXApplicationExtension:
839+
case PlatformKind::macOSApplicationExtension:
840840
plat = "macos_app_extension";
841841
break;
842842
case PlatformKind::iOSApplicationExtension:

‎lib/Sema/TypeCheckAvailability.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1253,8 +1253,8 @@ static bool fixAvailabilityByNarrowingNearbyVersionCheck(
12531253
auto Platform = targetPlatform(Context.LangOpts);
12541254
if (RunningVers.getMajor() != RequiredVers.getMajor())
12551255
return false;
1256-
if ((Platform == PlatformKind::OSX ||
1257-
Platform == PlatformKind::OSXApplicationExtension) &&
1256+
if ((Platform == PlatformKind::macOS ||
1257+
Platform == PlatformKind::macOSApplicationExtension) &&
12581258
!(RunningVers.getMinor().hasValue() &&
12591259
RequiredVers.getMinor().hasValue() &&
12601260
RunningVers.getMinor().getValue() ==

0 commit comments

Comments
 (0)