Skip to content

Commit 244dc4a

Browse files
author
Nathan Hawes
committed
[AST] Rename PlatformKind::OSX to PlatformKind::macOS
Because the names are coming from a .def file used for printing too, this simplifies the printing logic as well.
1 parent 9bcb549 commit 244dc4a

File tree

14 files changed

+33
-43
lines changed

14 files changed

+33
-43
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 & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,6 @@
2424
using namespace swift;
2525

2626
StringRef swift::platformString(PlatformKind platform) {
27-
// FIXME: Update PlatformKinds.def to use the macOS spelling by default.
28-
switch (platform) {
29-
case PlatformKind::OSX:
30-
return "macOS";
31-
case PlatformKind::OSXApplicationExtension:
32-
return "macOSApplicationExtension";
33-
default: break;
34-
}
35-
3627
switch (platform) {
3728
case PlatformKind::none:
3829
return "*";
@@ -62,8 +53,8 @@ Optional<PlatformKind> swift::platformFromString(StringRef Name) {
6253
return llvm::StringSwitch<Optional<PlatformKind>>(Name)
6354
#define AVAILABILITY_PLATFORM(X, PrettyName) .Case(#X, PlatformKind::X)
6455
#include "swift/AST/PlatformKinds.def"
65-
.Case("macOS", PlatformKind::OSX)
66-
.Case("macOSApplicationExtension", PlatformKind::OSXApplicationExtension)
56+
.Case("OSX", PlatformKind::macOS)
57+
.Case("OSXApplicationExtension", PlatformKind::macOSApplicationExtension)
6758
.Default(Optional<PlatformKind>());
6859
}
6960

@@ -73,16 +64,16 @@ static bool isPlatformActiveForTarget(PlatformKind Platform,
7364
if (Platform == PlatformKind::none)
7465
return true;
7566

76-
if (Platform == PlatformKind::OSXApplicationExtension ||
67+
if (Platform == PlatformKind::macOSApplicationExtension ||
7768
Platform == PlatformKind::iOSApplicationExtension ||
7869
Platform == PlatformKind::macCatalystApplicationExtension)
7970
if (!EnableAppExtensionRestrictions)
8071
return false;
8172

8273
// FIXME: This is an awful way to get the current OS.
8374
switch (Platform) {
84-
case PlatformKind::OSX:
85-
case PlatformKind::OSXApplicationExtension:
75+
case PlatformKind::macOS:
76+
case PlatformKind::macOSApplicationExtension:
8677
return Target.isMacOSX();
8778
case PlatformKind::iOS:
8879
case PlatformKind::iOSApplicationExtension:
@@ -118,8 +109,8 @@ bool swift::isPlatformActive(PlatformKind Platform, const LangOptions &LangOpts,
118109
PlatformKind swift::targetPlatform(const LangOptions &LangOpts) {
119110
if (LangOpts.Target.isMacOSX()) {
120111
return (LangOpts.EnableAppExtensionRestrictions
121-
? PlatformKind::OSXApplicationExtension
122-
: PlatformKind::OSX);
112+
? PlatformKind::macOSApplicationExtension
113+
: PlatformKind::macOS);
123114
}
124115

125116
if (LangOpts.Target.isTvOS()) {
@@ -171,8 +162,8 @@ llvm::VersionTuple swift::canonicalizePlatformVersion(
171162

172163
// Canonicalize macOS version for macOS Big Sur to treat
173164
// 10.16 as 11.0.
174-
if (platform == PlatformKind::OSX ||
175-
platform == PlatformKind::OSXApplicationExtension) {
165+
if (platform == PlatformKind::macOS ||
166+
platform == PlatformKind::macOSApplicationExtension) {
176167
return llvm::Triple::getCanonicalVersionForOS(llvm::Triple::MacOSX,
177168
version);
178169
}

‎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
@@ -615,7 +615,7 @@ toolchains::Darwin::addDeploymentTargetArgs(ArgStringList &Arguments,
615615
// The first deployment of arm64 for macOS is version 10.16;
616616
if (triple.isAArch64() && major <= 10 && minor < 16) {
617617
llvm::VersionTuple firstMacARM64e(10, 16, 0);
618-
firstMacARM64e = canonicalizePlatformVersion(PlatformKind::OSX,
618+
firstMacARM64e = canonicalizePlatformVersion(PlatformKind::macOS,
619619
firstMacARM64e);
620620
major = firstMacARM64e.getMajor();
621621
minor = firstMacARM64e.getMinor().getValueOr(0);

‎lib/IDE/CodeCompletion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4429,7 +4429,6 @@ 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) \
44344433
addDeclAttrParamKeyword(swift::platformString(PlatformKind::X), \
44354434
"Platform", false);

‎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() ==

‎lib/Serialization/SerializedModuleLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ getOSAndVersionForDiagnostics(const llvm::Triple &triple) {
625625
// macOS triples represent their versions differently, so we have to use the
626626
// special accessor.
627627
triple.getMacOSXVersion(major, minor, micro);
628-
osName = swift::prettyPlatformString(PlatformKind::OSX);
628+
osName = swift::prettyPlatformString(PlatformKind::macOS);
629629
} else {
630630
triple.getOSVersion(major, minor, micro);
631631
if (triple.isWatchOS()) {

0 commit comments

Comments
 (0)