Skip to content

Commit fa730db

Browse files
committed
Allow ‘getEffectiveLanguageVersion’ to take a minor component for 4.2
Further, when ‘4’ is specified on its own for the language version without a minor component, assume ‘4.1’ as the language version.
1 parent f1e0c2b commit fa730db

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/Basic/Version.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ Optional<Version> Version::getEffectiveLanguageVersion() const {
302302
case 0:
303303
return None;
304304
case 1:
305+
case 2:
305306
break;
306307
default:
307308
// We do not want to permit users requesting more precise effective language
@@ -326,6 +327,9 @@ Optional<Version> Version::getEffectiveLanguageVersion() const {
326327
case 4:
327328
static_assert(SWIFT_VERSION_MAJOR == 4,
328329
"getCurrentLanguageVersion is no longer correct here");
330+
// Version '4' on its own implies '4.1'.
331+
if (size() == 1)
332+
return Version{4, 1};
329333
return Version::getCurrentLanguageVersion();
330334
case 5:
331335
return Version{5, 0};

0 commit comments

Comments
 (0)