use const enums in compiler

vladima · vladima · commit a8e5aad6e863 · 2014-11-03T23:31:38.000-08:00
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
@@ -5,7 +5,7 @@
 
 module ts {
 
-    export enum ModuleInstanceState {
+    export const enum ModuleInstanceState {
         NonInstantiated = 0,
         Instantiated    = 1,
         ConstEnumOnly   = 2
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1606,7 +1606,7 @@ module ts {
                         return true;
 
                     default:
-                        Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + SyntaxKind[node.kind]);
+                        Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);
                 }
             }
 
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -9,7 +9,7 @@ module ts {
     // x | y is False if both x and y are False.
     // x | y is Maybe if either x or y is Maybe, but neither x or y is True.
     // x | y is True if either x or y is True.
-    export enum Ternary {
+    export const enum Ternary {
         False = 0,
         Maybe = 1,
         True  = -1
@@ -19,7 +19,7 @@ module ts {
         [index: string]: T;
     }
 
-    export enum Comparison {
+    export const enum Comparison {
         LessThan    = -1,
         EqualTo     = 0,
         GreaterThan = 1
@@ -637,7 +637,7 @@ module ts {
         getSignatureConstructor: () => <any>Signature
     }
 
-    export enum AssertionLevel {
+    export const enum AssertionLevel {
         None = 0,
         Normal = 1,
         Aggressive = 2,
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -2829,7 +2829,7 @@ module ts {
                                 break;
 
                             default:
-                                Debug.fail("This is unknown parent for type parameter: " + SyntaxKind[node.parent.kind]);
+                                Debug.fail("This is unknown parent for type parameter: " + node.parent.kind);
                         }
 
                         return {
@@ -3225,7 +3225,7 @@ module ts {
                             break;
 
                         default:
-                            Debug.fail("This is unknown kind for signature: " + SyntaxKind[node.kind]);
+                            Debug.fail("This is unknown kind for signature: " + node.kind);
                     }
 
                     return {
@@ -3310,7 +3310,7 @@ module ts {
                             break;
 
                         default:
-                            Debug.fail("This is unknown parent for parameter: " + SyntaxKind[node.parent.kind]);
+                            Debug.fail("This is unknown parent for parameter: " + node.parent.kind);
                     }
 
                     return {
diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts
@@ -666,7 +666,7 @@ module ts {
         return undefined;
     }
 
-    enum ParsingContext {
+    const enum ParsingContext {
         SourceElements,          // Elements in source file
         ModuleElements,          // Elements in module declaration
         BlockStatements,         // Statements in block
@@ -687,7 +687,7 @@ module ts {
         Count                    // Number of parsing contexts
     }
 
-    enum Tristate {
+    const enum Tristate {
         False,
         True,
         Unknown
@@ -715,13 +715,13 @@ module ts {
         }
     };
 
-    enum LookAheadMode {
+    const enum LookAheadMode {
         NotLookingAhead,
         NoErrorYet,
         Error
     }
 
-    enum ModifierContext {
+    const enum ModifierContext {
         SourceElements,          // Top level elements in a source file
         ModuleElements,          // Elements in module declaration
         ClassMembers,            // Members in class declaration
@@ -730,7 +730,7 @@ module ts {
 
     // Tracks whether we nested (directly or indirectly) in a certain control block.
     // Used for validating break and continue statements.
-    enum ControlBlockContext {
+    const enum ControlBlockContext {
         NotNested,
         Nested,
         CrossingFunctionBoundary
@@ -2734,7 +2734,7 @@ module ts {
                     currentKind = SetAccesor;
                 }
                 else {
-                    Debug.fail("Unexpected syntax kind:" + SyntaxKind[p.kind]);
+                    Debug.fail("Unexpected syntax kind:" + p.kind);
                 }
 
                 if (!hasProperty(seen, p.name.text)) {
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -9,7 +9,7 @@ module ts {
     }
 
     // token > SyntaxKind.Identifer => token is a keyword
-    export enum SyntaxKind {
+    export const enum SyntaxKind {
         Unknown,
         EndOfFileToken,
         SingleLineCommentTrivia,
@@ -249,7 +249,7 @@ module ts {
         LastTemplateToken = TemplateTail
     }
 
-    export enum NodeFlags {
+    export const enum NodeFlags {
         Export           = 0x00000001,  // Declarations
         Ambient          = 0x00000002,  // Declarations
         QuestionMark     = 0x00000004,  // Parameter/Property/Method
@@ -722,7 +722,7 @@ module ts {
         trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
     }
 
-    export enum TypeFormatFlags {
+    export const enum TypeFormatFlags {
         None                            = 0x00000000, 
         WriteArrayAsGenericType         = 0x00000001,  // Write Array<T> instead T[]
         UseTypeOfFunction               = 0x00000002,  // Write typeof instead of function type literal
@@ -733,7 +733,7 @@ module ts {
         InElementType                   = 0x00000040,  // Writing an array or union element type
     }
 
-    export enum SymbolFormatFlags {
+    export const enum SymbolFormatFlags {
         None                            = 0x00000000,
         WriteTypeParametersOrArguments  = 0x00000001,  // Write symbols's type argument if it is instantiated symbol
                                                        // eg. class C<T> { p: T }   <-- Show p as C<T>.p here
@@ -744,7 +744,7 @@ module ts {
                                                        // When this flag is specified m.c will be used to refer to the class instead of alias symbol x
     }
 
-    export enum SymbolAccessibility {
+    export const enum SymbolAccessibility {
         Accessible,
         NotAccessible,
         CannotBeNamed
@@ -778,7 +778,7 @@ module ts {
         hasEarlyErrors(sourceFile?: SourceFile): boolean;
     }
 
-    export enum SymbolFlags {
+    export const enum SymbolFlags {
         FunctionScopedVariable = 0x00000001,  // Variable (var) or parameter
         BlockScopedVariable    = 0x00000002,  // A block-scoped variable (let or const)
         Property               = 0x00000004,  // Property or enum member
@@ -890,7 +890,7 @@ module ts {
         [index: string]: Symbol;
     }
 
-    export enum NodeCheckFlags {
+    export const enum NodeCheckFlags {
         TypeChecked        = 0x00000001,  // Node has been type checked
         LexicalThis        = 0x00000002,  // Lexical 'this' reference
         CaptureThis        = 0x00000004,  // Lexical 'this' used in body
@@ -915,7 +915,7 @@ module ts {
         assignmentChecks?: Map<boolean>;  // Cache of assignment checks
     }
 
-    export enum TypeFlags {
+    export const enum TypeFlags {
         Any                = 0x00000001,
         String             = 0x00000002,
         Number             = 0x00000004,
@@ -1012,7 +1012,7 @@ module ts {
         mapper?: TypeMapper;     // Instantiation mapper
     }
 
-    export enum SignatureKind {
+    export const enum SignatureKind {
         Call,
         Construct,
     }
@@ -1032,7 +1032,7 @@ module ts {
         isolatedSignatureType?: ObjectType; // A manufactured type that just contains the signature for purposes of signature comparison
     }
 
-    export enum IndexKind {
+    export const enum IndexKind {
         String,
         Number,
     }
@@ -1112,7 +1112,7 @@ module ts {
         [option: string]: string | number | boolean;
     }
 
-    export enum ModuleKind {
+    export const enum ModuleKind {
         None,
         CommonJS,
         AMD,
@@ -1127,7 +1127,7 @@ module ts {
     }
 
 
-    export enum ScriptTarget {
+    export const enum ScriptTarget {
         ES3,
         ES5,
         ES6,
@@ -1149,7 +1149,7 @@ module ts {
         error?: DiagnosticMessage;          // The error given when the argument does not fit a customized 'type'.
     }
 
-    export enum CharacterCodes {
+    export const enum CharacterCodes {
         nullCharacter = 0,
         maxAsciiCharacter = 0x7F,
 
diff --git a/src/harness/compilerRunner.ts b/src/harness/compilerRunner.ts
@@ -3,7 +3,7 @@
 /// <reference path='typeWriter.ts' />
 /// <reference path='syntacticCleaner.ts' />
 
-enum CompilerTestType {
+const enum CompilerTestType {
     Conformance,
     Regressions,
     Test262
diff --git a/src/harness/fourslash.ts b/src/harness/fourslash.ts
@@ -2368,7 +2368,7 @@ module FourSlash {
         };
     }
 
-    enum State {
+    const enum State {
         none,
         inSlashStarMarker,
         inObjectMarker
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
@@ -30,7 +30,7 @@ module Utils {
     var global = <any>Function("return this").call(null);
 
     // Setup some globals based on the current environment
-    export enum ExecutionEnvironment {
+    export const enum ExecutionEnvironment {
         Node,
         Browser,
         CScript
diff --git a/src/harness/typeWriter.ts b/src/harness/typeWriter.ts
@@ -1,7 +1,7 @@
 interface TypeWriterResult {
     line: number;
     column: number;
-    syntaxKind: string;
+    syntaxKind: number;
     sourceText: string;
     type: string;
 }
@@ -84,7 +84,7 @@ class TypeWriterWalker {
         this.results.push({
             line: lineAndCharacter.line - 1,
             column: lineAndCharacter.character,
-            syntaxKind: ts.SyntaxKind[node.kind],
+            syntaxKind: node.kind,
             sourceText: sourceText,
             type: this.checker.typeToString(type, node.parent, ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.WriteOwnNameForAnyLike)
         });
diff --git a/src/services/services.ts b/src/services/services.ts
@@ -1065,7 +1065,7 @@ module ts {
         emitOutputStatus: EmitReturnStatus;
     }
 
-    export enum OutputFileType {
+    export const enum OutputFileType {
         JavaScript,
         SourceMap,
         Declaration
@@ -1077,7 +1077,7 @@ module ts {
         text: string;
     }
 
-    export enum EndOfLineState {
+    export const enum EndOfLineState {
         Start,
         InMultiLineCommentTrivia,
         InSingleQuoteStringLiteral,
@@ -1780,7 +1780,7 @@ module ts {
         var buckets: Map<Map<DocumentRegistryEntry>> = {};
 
         function getKeyFromCompilationSettings(settings: CompilerOptions): string {
-            return "_" + ScriptTarget[settings.target]; //  + "|" + settings.propagateEnumConstantoString()
+            return "_" + settings.target; //  + "|" + settings.propagateEnumConstantoString()
         }
 
         function getBucketForCompilationSettings(settings: CompilerOptions, createIfMissing: boolean): Map<DocumentRegistryEntry> {
@@ -2028,15 +2028,15 @@ module ts {
         }
     }
 
-    enum SemanticMeaning {
+    const enum SemanticMeaning {
         None = 0x0,
         Value = 0x1,
         Type = 0x2,
         Namespace = 0x4,
         All = Value | Type | Namespace
     }
 
-    enum BreakContinueSearchType {
+    const enum BreakContinueSearchType {
         None = 0x0,
         Unlabeled = 0x1,
         Labeled = 0x2,
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -171,13 +171,13 @@ module ts {
     }
 
     /// TODO: delete this, it is only needed until the VS interface is updated
-    export enum LanguageVersion {
+    export const enum LanguageVersion {
         EcmaScript3 = 0,
         EcmaScript5 = 1,
         EcmaScript6 = 2,
     }
 
-    export enum ModuleGenTarget {
+    export const enum ModuleGenTarget {
         Unspecified = 0,
         Synchronous = 1,
         Asynchronous = 2,
diff --git a/src/services/signatureHelp.ts b/src/services/signatureHelp.ts
@@ -244,7 +244,7 @@ module ts.SignatureHelp {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
                 if (n.pos < n.parent.pos || n.end > n.parent.end) {
-                    Debug.fail("Node of kind " + SyntaxKind[n.kind] + " is not a subspan of its parent of kind " + SyntaxKind[n.parent.kind]);
+                    Debug.fail("Node of kind " + n.kind + " is not a subspan of its parent of kind " + n.parent.kind);
                 }
 
                 var argumentInfo = getImmediatelyContainingArgumentInfo(n);

Original file line number	Diff line number	Diff line change
`@@ -1606,7 +1606,7 @@ module ts {`
`1606`	`1606`	`return true;`
`1607`	`1607`
`1608`	`1608`	`default:`
`1609`		`- Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + SyntaxKind[node.kind]);`
	`1609`	`+ Debug.fail("isDeclarationVisible unknown: SyntaxKind: " + node.kind);`
`1610`	`1610`	`}`
`1611`	`1611`	`}`
`1612`	`1612`
Original file line number	Diff line number	Diff line change
`@@ -2829,7 +2829,7 @@ module ts {`
`2829`	`2829`	`break;`
`2830`	`2830`
`2831`	`2831`	`default:`
`2832`		`- Debug.fail("This is unknown parent for type parameter: " + SyntaxKind[node.parent.kind]);`
	`2832`	`+ Debug.fail("This is unknown parent for type parameter: " + node.parent.kind);`
`2833`	`2833`	`}`
`2834`	`2834`
`2835`	`2835`	`return {`
`@@ -3225,7 +3225,7 @@ module ts {`
`3225`	`3225`	`break;`
`3226`	`3226`
`3227`	`3227`	`default:`
`3228`		`- Debug.fail("This is unknown kind for signature: " + SyntaxKind[node.kind]);`
	`3228`	`+ Debug.fail("This is unknown kind for signature: " + node.kind);`
`3229`	`3229`	`}`
`3230`	`3230`
`3231`	`3231`	`return {`
`@@ -3310,7 +3310,7 @@ module ts {`
`3310`	`3310`	`break;`
`3311`	`3311`
`3312`	`3312`	`default:`
`3313`		`- Debug.fail("This is unknown parent for parameter: " + SyntaxKind[node.parent.kind]);`
	`3313`	`+ Debug.fail("This is unknown parent for parameter: " + node.parent.kind);`
`3314`	`3314`	`}`
`3315`	`3315`
`3316`	`3316`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -2368,7 +2368,7 @@ module FourSlash {`
`2368`	`2368`	`};`
`2369`	`2369`	`}`
`2370`	`2370`
`2371`		`- enum State {`
	`2371`	`+ const enum State {`
`2372`	`2372`	`none,`
`2373`	`2373`	`inSlashStarMarker,`
`2374`	`2374`	`inObjectMarker`