NFC: Subset out floating point raw value enum parsing tests

test/Parse/enum.swift

@@ -1,13 +1,5 @@
 // RUN: %target-typecheck-verify-swift
 
-// FIXME: this test only passes on platforms which have Float80.
-// <rdar://problem/19508460> Floating point enum raw values are not portable
-
-// REQUIRES: CPU=i386 || CPU=x86_64
-
-// Windows does not support FP80
-// XFAIL: OS=windows-msvc
-
 enum Empty {}
 
 enum Boolish {
@@ -207,12 +199,6 @@ enum RawTypeWithCharacterValues_Error1 : Character { // expected-error {{'RawTyp
   case First = "abc" // expected-error {{cannot convert value of type 'String' to raw type 'Character'}}
 }
 
-enum RawTypeWithFloatValues : Float { // expected-error {{'RawTypeWithFloatValues' declares raw type 'Float', but does not conform to RawRepresentable and conformance could not be synthesized}}
-  case Northrup = 1.5
-  case Overton // expected-error {{enum case must declare a raw value when the preceding raw value is not an integer}}
-  case Pettygrove = 2.25
-}
-
 enum RawTypeWithStringValues : String {
   case Primrose // okay
   case Quimby = "Lucky Lab"
@@ -229,86 +215,22 @@ enum RawTypeWithRepeatValues : Int {
   case Wilson = 22 // expected-error {{raw value for enum case is not unique}}
 }
 
-enum RawTypeWithRepeatValues2 : Double {
-  case Vaughn = 22   // expected-note {{raw value previously used here}}
-  case Wilson = 22.0 // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValues3 : Double {
-  // 2^63-1
-  case Vaughn = 9223372036854775807   // expected-note {{raw value previously used here}}
-  case Wilson = 9223372036854775807.0 // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValues4 : Double {
-  // 2^64-1
-  case Vaughn = 18446744073709551615   // expected-note {{raw value previously used here}}
-  case Wilson = 18446744073709551615.0 // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValues5 : Double {
-  // FIXME: should reject.
-  // 2^65-1
-  case Vaughn = 36893488147419103231
-  case Wilson = 36893488147419103231.0
-}
-
-enum RawTypeWithRepeatValues6 : Double {
-  // FIXME: should reject.
-  // 2^127-1
-  case Vaughn = 170141183460469231731687303715884105727
-  case Wilson = 170141183460469231731687303715884105727.0
-}
-
-enum RawTypeWithRepeatValues7 : Double {
-  // FIXME: should reject.
-  // 2^128-1
-  case Vaughn = 340282366920938463463374607431768211455
-  case Wilson = 340282366920938463463374607431768211455.0
-}
-
-enum RawTypeWithRepeatValues8 : String {
+enum RawTypeWithRepeatValuesString : String {
   case Vaughn = "XYZ" // expected-note {{raw value previously used here}}
   case Wilson = "XYZ" // expected-error {{raw value for enum case is not unique}}
 }
 
-enum RawTypeWithNonRepeatValues : Double {
-  case SantaClara = 3.7
-  case SanFernando = 7.4
-  case SanAntonio = -3.7
-  case SanCarlos = -7.4
-}
-
-
-enum RawTypeWithRepeatValuesAutoInc : Double {
-  case Vaughn = 22 // expected-note {{raw value auto-incremented from here}}
-  case Wilson    // expected-note {{raw value previously used here}}
-  case Yeon = 23 // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValuesAutoInc2 : Double {
-  case Vaughn = 23 // expected-note {{raw value previously used here}}
-  case Wilson = 22 // expected-note {{raw value auto-incremented from here}}
-  case Yeon // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValuesAutoInc3 : Double {
-  case Vaughn // expected-note {{raw value implicitly auto-incremented from zero}}
-  case Wilson // expected-note {{raw value previously used here}}
-  case Yeon = 1 // expected-error {{raw value for enum case is not unique}}
-}
-
-enum RawTypeWithRepeatValuesAutoInc4 : String {
+enum RawTypeWithRepeatValuesAutoInc1 : String {
   case A = "B" // expected-note {{raw value previously used here}}
   case B // expected-error {{raw value for enum case is not unique}}
 }
 
-enum RawTypeWithRepeatValuesAutoInc5 : String {
+enum RawTypeWithRepeatValuesAutoInc2 : String {
   case A // expected-note {{raw value previously used here}}
   case B = "A" // expected-error {{raw value for enum case is not unique}}
 }
 
-enum RawTypeWithRepeatValuesAutoInc6 : String {
+enum RawTypeWithRepeatValuesAutoInc3 : String {
   case A
   case B // expected-note {{raw value previously used here}}
   case C = "B" // expected-error {{raw value for enum case is not unique}}
@@ -440,25 +362,6 @@ enum ManyLiteralC : ManyLiteralable {
   case B = "0"
 }
 
-// rdar://problem/22476643
-public protocol RawValueA: RawRepresentable
-{
-  var rawValue: Double { get }
-}
-
-enum RawValueATest: Double, RawValueA {
-  case A, B
-}
-
-public protocol RawValueB
-{
-  var rawValue: Double { get }
-}
-
-enum RawValueBTest: Double, RawValueB {
-  case A, B
-}
-
 enum foo : String { // expected-error {{'foo' declares raw type 'String', but does not conform to RawRepresentable and conformance could not be synthesized}}
   case bar = nil // expected-error {{cannot convert 'nil' to raw type 'String'}}
 }

test/Parse/enum_floating_point_raw_value.swift

@@ -0,0 +1,97 @@
+// RUN: %target-typecheck-verify-swift
+
+// FIXME: this test only passes on platforms which have Float80.
+// <rdar://problem/19508460> Floating point enum raw values are not portable
+
+// REQUIRES: CPU=i386 || CPU=x86_64
+
+// Windows does not support FP80
+// XFAIL: OS=windows-msvc
+
+enum RawTypeWithFloatValues : Float { // expected-error {{'RawTypeWithFloatValues' declares raw type 'Float', but does not conform to RawRepresentable and conformance could not be synthesized}}
+  case Northrup = 1.5
+  case Overton // expected-error {{enum case must declare a raw value when the preceding raw value is not an integer}}
+  case Pettygrove = 2.25
+}
+
+enum RawTypeWithRepeatValues2 : Double {
+  case Vaughn = 22   // expected-note {{raw value previously used here}}
+  case Wilson = 22.0 // expected-error {{raw value for enum case is not unique}}
+}
+
+enum RawTypeWithRepeatValues3 : Double {
+  // 2^63-1
+  case Vaughn = 9223372036854775807   // expected-note {{raw value previously used here}}
+  case Wilson = 9223372036854775807.0 // expected-error {{raw value for enum case is not unique}}
+}
+
+enum RawTypeWithRepeatValues4 : Double {
+  // 2^64-1
+  case Vaughn = 18446744073709551615   // expected-note {{raw value previously used here}}
+  case Wilson = 18446744073709551615.0 // expected-error {{raw value for enum case is not unique}}
+}
+
+enum RawTypeWithRepeatValues5 : Double {
+  // FIXME: should reject.
+  // 2^65-1
+  case Vaughn = 36893488147419103231
+  case Wilson = 36893488147419103231.0
+}
+
+enum RawTypeWithRepeatValues6 : Double {
+  // FIXME: should reject.
+  // 2^127-1
+  case Vaughn = 170141183460469231731687303715884105727
+  case Wilson = 170141183460469231731687303715884105727.0
+}
+
+enum RawTypeWithRepeatValues7 : Double {
+  // FIXME: should reject.
+  // 2^128-1
+  case Vaughn = 340282366920938463463374607431768211455
+  case Wilson = 340282366920938463463374607431768211455.0
+}
+
+enum RawTypeWithNonRepeatValues : Double {
+  case SantaClara = 3.7
+  case SanFernando = 7.4
+  case SanAntonio = -3.7
+  case SanCarlos = -7.4
+}
+
+enum RawTypeWithRepeatValuesAutoInc : Double {
+  case Vaughn = 22 // expected-note {{raw value auto-incremented from here}}
+  case Wilson    // expected-note {{raw value previously used here}}
+  case Yeon = 23 // expected-error {{raw value for enum case is not unique}}
+}
+
+enum RawTypeWithRepeatValuesAutoInc2 : Double {
+  case Vaughn = 23 // expected-note {{raw value previously used here}}
+  case Wilson = 22 // expected-note {{raw value auto-incremented from here}}
+  case Yeon // expected-error {{raw value for enum case is not unique}}
+}
+
+enum RawTypeWithRepeatValuesAutoInc3 : Double {
+  case Vaughn // expected-note {{raw value implicitly auto-incremented from zero}}
+  case Wilson // expected-note {{raw value previously used here}}
+  case Yeon = 1 // expected-error {{raw value for enum case is not unique}}
+}
+
+// rdar://problem/22476643
+public protocol RawValueA: RawRepresentable
+{
+  var rawValue: Double { get }
+}
+
+enum RawValueATest: Double, RawValueA {
+  case A, B
+}
+
+public protocol RawValueB
+{
+  var rawValue: Double { get }
+}
+
+enum RawValueBTest: Double, RawValueB {
+  case A, B
+}