Merge pull request #17796 from rintaro/parse-drop3-tests

[Parse] Migrate tests to Swift4

Author: rintaro

test/Interpreter/bool_as_generic.swift

@@ -1,10 +1,10 @@
-// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
+// RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
 // <rdar://problem/13986638> Missing Bool metadata when Bool is used as a generic
 // parameter or existential value
 
-prefix operator !! {}
-infix operator &&& {}
+prefix operator !!
+infix operator &&&
 
 protocol BooleanProtocol {
   var boolValue: Bool { get }

test/Interpreter/tuples.swift

@@ -1,11 +1,11 @@
-// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
+// RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
 
 typealias Interval = (lo: Int, hi: Int)
 
-infix operator <+> {}
-infix operator <-> {}
-infix operator <+>= {}
+infix operator <+>
+infix operator <->
+infix operator <+>=
 
 func <+>(a: Interval, b: Interval) -> Interval {
   return (a.lo + b.lo, a.hi + b.hi)

test/Parse/ConditionalCompilation/identifierName.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -swift-version 3
+// RUN: %target-typecheck-verify-swift
 
 // Ensure that the identifiers in compilation conditions don't reference
 // any decls in the scope.
@@ -23,10 +23,10 @@ func f2(
   _ = _endian + big + little
 #elseif _runtime(_ObjC) && _runtime(_Native)
   _ = _runtime + _ObjC + _Native
-#elseif swift(>=1.0) && _compiler_version("3.*.0")
-  _ = swift + _compiler_version
 #elseif targetEnvironment(simulator)
   _ = targetEnvironment + simulator
+#elseif swift(>=1.0) && _compiler_version("4.*.0")
+  _ = swift + _compiler_version
 #endif
 
 }
@@ -51,10 +51,10 @@ func f2() {
   _ = _endian + big + little
 #elseif _runtime(_ObjC) && _runtime(_Native)
   _ = _runtime + _ObjC + _Native
-#elseif swift(>=1.0) && _compiler_version("3.*.0")
-  _ = swift + _compiler_version
 #elseif targetEnvironment(simulator)
   _ = targetEnvironment + simulator
+#elseif swift(>=1.0) && _compiler_version("4.*.0")
+  _ = swift + _compiler_version
 #endif
 
 }
@@ -74,8 +74,8 @@ struct S {
 #elseif arch(i386) && arch(arm)
 #elseif _endian(big) && _endian(little)
 #elseif _runtime(_ObjC) && _runtime(_Native)
-#elseif swift(>=1.0) && _compiler_version("3.*.0")
 #elseif targetEnvironment(simulator)
+#elseif swift(>=1.0) && _compiler_version("4.*.0")
 #endif
 
 }

test/Parse/swift3_warnings_swift4_errors_version_3.swift

@@ -15,7 +15,7 @@
 //  prototype to which we can refer when building the standard library.
 //
 //===----------------------------------------------------------------------===//
-// RUN: %target-run-simple-swift-swift3 | %FileCheck %s
+// RUN: %target-run-simple-swift | %FileCheck %s
 // REQUIRES: executable_test
 
 // CHECK: testing...
@@ -34,7 +34,7 @@ protocol F {
   // refinement of F having a non-default distance implementation need
   // to know about it.  These refinements are expected to be rare
   // (which is why defaulted requirements are a win)
-  func ~> (_: Self, _: (_Distance, (Self))) -> Int
+  static func ~> (_: Self, _: (_Distance, (Self))) -> Int
 }
 
 // Operation tag for distance