From be0fc3bc986b25db417f66131b00508a9959ce86 Mon Sep 17 00:00:00 2001
From: Anders Hejlsberg <andersh@microsoft.com>
Date: Sat, 29 Apr 2017 10:13:52 -0700
Subject: [PATCH] Accept new baselines

---
 .../baselines/reference/enumErrors.errors.txt | 31 ++++++++++++++++---
 tests/baselines/reference/enumErrors.js       | 22 +++++++++++--
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/tests/baselines/reference/enumErrors.errors.txt b/tests/baselines/reference/enumErrors.errors.txt
index 3efa042ff38..096722fc4bd 100644
--- a/tests/baselines/reference/enumErrors.errors.txt
+++ b/tests/baselines/reference/enumErrors.errors.txt
@@ -3,13 +3,17 @@ tests/cases/conformance/enums/enumErrors.ts(3,6): error TS2431: Enum name cannot
 tests/cases/conformance/enums/enumErrors.ts(4,6): error TS2431: Enum name cannot be 'string'.
 tests/cases/conformance/enums/enumErrors.ts(5,6): error TS2431: Enum name cannot be 'boolean'.
 tests/cases/conformance/enums/enumErrors.ts(9,9): error TS2322: Type 'Number' is not assignable to type 'E5'.
-tests/cases/conformance/enums/enumErrors.ts(26,9): error TS2322: Type '""' is not assignable to type 'E11'.
+tests/cases/conformance/enums/enumErrors.ts(26,9): error TS2322: Type 'true' is not assignable to type 'E11'.
 tests/cases/conformance/enums/enumErrors.ts(27,9): error TS2322: Type 'Date' is not assignable to type 'E11'.
 tests/cases/conformance/enums/enumErrors.ts(28,9): error TS2304: Cannot find name 'window'.
 tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is not assignable to type 'E11'.
+tests/cases/conformance/enums/enumErrors.ts(35,9): error TS2551: Computed values are not permitted in an enum with string valued members.
+tests/cases/conformance/enums/enumErrors.ts(36,9): error TS2551: Computed values are not permitted in an enum with string valued members.
+tests/cases/conformance/enums/enumErrors.ts(37,9): error TS2551: Computed values are not permitted in an enum with string valued members.
+tests/cases/conformance/enums/enumErrors.ts(38,9): error TS2551: Computed values are not permitted in an enum with string valued members.
 
 
-==== tests/cases/conformance/enums/enumErrors.ts (9 errors) ====
+==== tests/cases/conformance/enums/enumErrors.ts (13 errors) ====
     // Enum named with PredefinedTypes
     enum any { }
          ~~~
@@ -45,9 +49,9 @@ tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is no
     
     // Enum with computed member intializer of other types
     enum E11 {
-        A = '',
-            ~~
-!!! error TS2322: Type '""' is not assignable to type 'E11'.
+        A = true,
+            ~~~~
+!!! error TS2322: Type 'true' is not assignable to type 'E11'.
         B = new Date(),
             ~~~~~~~~~~
 !!! error TS2322: Type 'Date' is not assignable to type 'E11'.
@@ -58,4 +62,21 @@ tests/cases/conformance/enums/enumErrors.ts(29,9): error TS2322: Type '{}' is no
             ~~
 !!! error TS2322: Type '{}' is not assignable to type 'E11'.
     }
+    
+    // Enum with string valued member and computed member initializers
+    enum E12 {
+        A = '',
+        B = new Date(),
+            ~~~~~~~~~~
+!!! error TS2551: Computed values are not permitted in an enum with string valued members.
+        C = window,
+            ~~~~~~
+!!! error TS2551: Computed values are not permitted in an enum with string valued members.
+        D = {},
+            ~~
+!!! error TS2551: Computed values are not permitted in an enum with string valued members.
+        E = 1 + 1,
+            ~~~~~
+!!! error TS2551: Computed values are not permitted in an enum with string valued members.
+    }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/enumErrors.js b/tests/baselines/reference/enumErrors.js
index a8ecdf2470a..17b67864c70 100644
--- a/tests/baselines/reference/enumErrors.js
+++ b/tests/baselines/reference/enumErrors.js
@@ -24,11 +24,20 @@ enum E10 {
 
 // Enum with computed member intializer of other types
 enum E11 {
-    A = '',
+    A = true,
     B = new Date(),
     C = window,
     D = {}
 }
+
+// Enum with string valued member and computed member initializers
+enum E12 {
+    A = '',
+    B = new Date(),
+    C = window,
+    D = {},
+    E = 1 + 1,
+}
 
 
 //// [enumErrors.js]
@@ -65,8 +74,17 @@ var E10;
 // Enum with computed member intializer of other types
 var E11;
 (function (E11) {
-    E11[E11["A"] = ''] = "A";
+    E11[E11["A"] = true] = "A";
     E11[E11["B"] = new Date()] = "B";
     E11[E11["C"] = window] = "C";
     E11[E11["D"] = {}] = "D";
 })(E11 || (E11 = {}));
+// Enum with string valued member and computed member initializers
+var E12;
+(function (E12) {
+    E12["A"] = "";
+    E12[E12["B"] = 0] = "B";
+    E12[E12["C"] = 0] = "C";
+    E12[E12["D"] = 0] = "D";
+    E12[E12["E"] = 0] = "E";
+})(E12 || (E12 = {}));