Merge pull request swiftlang#37264 from nkcsgexi/underscore_version_canimport

Use underscored syntax for versioned canImport condition

Author: nkcsgexi

include/swift/AST/DiagnosticsParse.def

@@ -1774,7 +1774,7 @@ WARNING(likely_simulator_platform_condition,none,
 
 ERROR(canimport_two_parameters, none, "canImport can take only two parameters", ())
 
-ERROR(canimport_label, none, "2nd parameter of canImport should be labeled as version or underlyingVersion", ())
+ERROR(canimport_label, none, "2nd parameter of canImport should be labeled as _version or _underlyingVersion", ())
 
 ERROR(canimport_version, none, "cannot parse module version: %0", (StringRef))
 

lib/Parse/ParseIfConfig.cpp

@@ -88,9 +88,9 @@ static llvm::VersionTuple getCanImportVersion(TupleExpr *te,
   }
   auto label = te->getElementName(1);
   auto subE = te->getElement(1);
-  if (label.str() == "version") {
+  if (label.str() == "_version") {
     underlyingVersion = false;
-  } else if (label.str() == "underlyingVersion") {
+  } else if (label.str() == "_underlyingVersion") {
     underlyingVersion = true;
   } else {
     if (D) {

test/ClangImporter/versioned_canimport.swift

@@ -15,25 +15,25 @@
 import Simple
 
 func canImportVersioned() {
-#if canImport(Simple, underlyingVersion: 3.3)
+#if canImport(Simple, _underlyingVersion: 3.3)
   let a = 1  // expected-warning {{initialization of immutable value 'a' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 
-#if canImport(Simple, underlyingVersion: 1830.100)
+#if canImport(Simple, _underlyingVersion: 1830.100)
   let b = 1  // expected-warning {{initialization of immutable value 'b' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 
-#if canImport(Simple, underlyingVersion: 1830.11)
+#if canImport(Simple, _underlyingVersion: 1830.11)
   let c = 1  // expected-warning {{initialization of immutable value 'c' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 }
 
 func canNotImportVersioned() {
-#if canImport(Simple, underlyingVersion: 1831)
+#if canImport(Simple, _underlyingVersion: 1831)
   let a = 1
 #endif
 
-#if canImport(Simple, underlyingVersion: 1830.101)
+#if canImport(Simple, _underlyingVersion: 1830.101)
   let b = 1
 #endif
 }

test/ClangImporter/versioned_canimport_no_version.swift

@@ -15,6 +15,6 @@
 import Simple
 
 func canImportVersioned() {
-#if canImport(Simple, underlyingVersion: 3.3) // expected-warning {{cannot find user version number for Clang module 'Simple'; version number ignored}}
+#if canImport(Simple, _underlyingVersion: 3.3) // expected-warning {{cannot find user version number for Clang module 'Simple'; version number ignored}}
 #endif
 }

test/Parse/ifconfig_expr.swift

@@ -127,27 +127,27 @@ func ifconfigExprInExpr(baseExpr: MyStruct) {
 }
 
 func canImportVersioned() {
-#if canImport(A, version: 2)
+#if canImport(A, _version: 2)
   let a = 1
 #endif
 
-#if canImport(A, version: 2.2)
+#if canImport(A, _version: 2.2)
   let a = 1
 #endif
 
-#if canImport(A, underlyingVersion: 4)
+#if canImport(A, _underlyingVersion: 4)
   let a = 1
 #endif
 
-#if canImport(A, underlyingVersion: 2.200)
+#if canImport(A, _underlyingVersion: 2.200)
   let a = 1
 #endif
 
-#if canImport(A, unknown: 2.2) // expected-error {{2nd parameter of canImport should be labeled as version or underlyingVersion}}
+#if canImport(A, unknown: 2.2) // expected-error {{2nd parameter of canImport should be labeled as _version or _underlyingVersion}}
   let a = 1
 #endif
 
-#if canImport(A, 2.2) // expected-error {{2nd parameter of canImport should be labeled as version or underlyingVersion}}
+#if canImport(A, 2.2) // expected-error {{2nd parameter of canImport should be labeled as _version or _underlyingVersion}}
   let a = 1
 #endif
 

test/Parse/versioned_canimport.swift

@@ -13,42 +13,42 @@
 import Foo
 import Bar
 
-#if canImport(Bar, version: 113.331) // expected-warning {{cannot find user version number for Swift module 'Bar'; version number ignored}}
+#if canImport(Bar, _version: 113.331) // expected-warning {{cannot find user version number for Swift module 'Bar'; version number ignored}}
 #endif
 
-#if canImport(Bar, version: 2) // expected-warning {{cannot find user version number for Swift module 'Bar'; version number ignored}}
+#if canImport(Bar, _version: 2) // expected-warning {{cannot find user version number for Swift module 'Bar'; version number ignored}}
 #endif
 
 func canImportVersioned() {
-#if canImport(Foo, version: 113.331)
+#if canImport(Foo, _version: 113.331)
   let a = 1
 #endif
 
-#if canImport(Foo, version: 113.3000)
+#if canImport(Foo, _version: 113.3000)
   let b = 1
 #endif
 
-#if canImport(Foo, version: 114)
+#if canImport(Foo, _version: 114)
   let c = 1
 #endif
 
-#if canImport(Foo, version: 4)
+#if canImport(Foo, _version: 4)
   let d = 1 // expected-warning {{initialization of immutable value 'd' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 
-#if canImport(Foo, version: 113.33)
+#if canImport(Foo, _version: 113.33)
   let e = 1 // expected-warning {{initialization of immutable value 'e' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 
-#if canImport(Foo, underlyingVersion: 113.33)
+#if canImport(Foo, _underlyingVersion: 113.33)
   let ee = 1
 #endif
 
-#if canImport(Foo, version: 113.329)
+#if canImport(Foo, _version: 113.329)
   let f = 1 // expected-warning {{initialization of immutable value 'f' was never used; consider replacing with assignment to '_' or removing it}}
 #endif
 
-#if canImport(Foo, version: 113.330)
+#if canImport(Foo, _version: 113.330)
   let g = 1 // expected-warning {{initialization of immutable value 'g' was never used; consider replacing with assignment to '_' or removing it}}
 #endif