revert enum related changes

vladima · vladima · commit 0465f1b0bb13 · 2015-10-13T13:18:58.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -13203,8 +13203,6 @@ namespace ts {
             let nodeLinks = getNodeLinks(node);
 
             if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) {
-                nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed;
-
                 let enumSymbol = getSymbolOfNode(node);
                 let enumType = getDeclaredTypeOfSymbol(enumSymbol);
                 let autoValue = 0; // set to undefined when enum member is non-constant
@@ -13242,6 +13240,8 @@ namespace ts {
                         getNodeLinks(member).enumMemberValue = autoValue++;
                     }
                 }
+
+                nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed;
             }
 
             function computeConstantValueForEnumMemberInitializer(initializer: Expression, enumType: Type, enumIsConst: boolean, ambient: boolean): number {
@@ -13387,7 +13387,6 @@ namespace ts {
                                 return undefined;
                             }
 
-                            computeEnumMemberValues(<EnumDeclaration>propertyDecl.parent);
                             return <number>getNodeLinks(propertyDecl).enumMemberValue;
                     }
                 }
diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.errors.txt
@@ -2,10 +2,9 @@ tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(2,13): error TS2448: Bl
 tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(58,20): error TS2448: Block-scoped variable 'x' used before its declaration.
 tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(65,20): error TS2448: Block-scoped variable 'x' used before its declaration.
 tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(100,12): error TS2448: Block-scoped variable 'x' used before its declaration.
-tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(105,20): error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
 
 
-==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (5 errors) ====
+==== tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts (4 errors) ====
     function foo0() {
         let a = x;
                 ~
@@ -116,15 +115,4 @@ tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts(105,20): error TS2651:
 !!! error TS2448: Block-scoped variable 'x' used before its declaration.
         }
         let x
-    }
-    
-    const enum A { X = B.Y }
-                       ~~~
-!!! error TS2651: A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums.
-    
-    const enum B { Y }
-    
-    function foo15() {
-        const enum A1 { X = B1.Y }
-    }
-    const enum B1 { Y }
+    }
diff --git a/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js b/tests/baselines/reference/blockScopedVariablesUseBeforeDef.js
@@ -101,16 +101,7 @@ function foo14() {
         a: x 
     }
     let x
-}
-
-const enum A { X = B.Y }
-
-const enum B { Y }
-
-function foo15() {
-    const enum A1 { X = B1.Y }
-}
-const enum B1 { Y }
+}
 
 //// [blockScopedVariablesUseBeforeDef.js]
 function foo0() {
@@ -223,5 +214,3 @@ function foo14() {
     };
     var x;
 }
-function foo15() {
-}
diff --git a/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts b/tests/cases/compiler/blockScopedVariablesUseBeforeDef.ts
@@ -101,13 +101,4 @@ function foo14() {
         a: x 
     }
     let x
-}
-
-const enum A { X = B.Y }
-
-const enum B { Y }
-
-function foo15() {
-    const enum A1 { X = B1.Y }
-}
-const enum B1 { Y }
+}

Original file line number	Diff line number	Diff line change
`@@ -13203,8 +13203,6 @@ namespace ts {`
`13203`	`13203`	`let nodeLinks = getNodeLinks(node);`
`13204`	`13204`
`13205`	`13205`	`if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) {`
`13206`		`- nodeLinks.flags \|= NodeCheckFlags.EnumValuesComputed;`
`13207`		`-`
`13208`	`13206`	`let enumSymbol = getSymbolOfNode(node);`
`13209`	`13207`	`let enumType = getDeclaredTypeOfSymbol(enumSymbol);`
`13210`	`13208`	`let autoValue = 0; // set to undefined when enum member is non-constant`
`@@ -13242,6 +13240,8 @@ namespace ts {`
`13242`	`13240`	`getNodeLinks(member).enumMemberValue = autoValue++;`
`13243`	`13241`	`}`
`13244`	`13242`	`}`
	`13243`	`+`
	`13244`	`+ nodeLinks.flags \|= NodeCheckFlags.EnumValuesComputed;`
`13245`	`13245`	`}`
`13246`	`13246`
`13247`	`13247`	`function computeConstantValueForEnumMemberInitializer(initializer: Expression, enumType: Type, enumIsConst: boolean, ambient: boolean): number {`
`@@ -13387,7 +13387,6 @@ namespace ts {`
`13387`	`13387`	`return undefined;`
`13388`	`13388`	`}`
`13389`	`13389`
`13390`		`- computeEnumMemberValues(<EnumDeclaration>propertyDecl.parent);`
`13391`	`13390`	`return <number>getNodeLinks(propertyDecl).enumMemberValue;`
`13392`	`13391`	`}`
`13393`	`13392`	`}`