Skip to content

Commit 7a4fb64

Browse files
Code review feedback.
1 parent cfac0be commit 7a4fb64

File tree

2 files changed

+16
-18
lines changed

2 files changed

+16
-18
lines changed

src/compiler/checker.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -972,8 +972,8 @@ module ts {
972972

973973
return {
974974
string: () => str,
975-
writeKind: (text, kind) => str += text,
976-
writeSymbol: (text, symbol) => str += text,
975+
writeKind: text => str += text,
976+
writeSymbol: text => str += text,
977977

978978
// Completely ignore indentation for string writers. And map newlines to
979979
// a single space.
@@ -6513,10 +6513,10 @@ module ts {
65136513
return undefined;
65146514
}
65156515

6516-
function computeEnumMemberValues(node: EnumDeclaration, reportErrors: boolean) {
6516+
function computeEnumMemberValues(node: EnumDeclaration) {
65176517
var nodeLinks = getNodeLinks(node);
65186518

6519-
if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputedAndChecked)) {
6519+
if (!(nodeLinks.flags & NodeCheckFlags.EnumValuesComputed)) {
65206520
var enumSymbol = getSymbolOfNode(node);
65216521
var enumType = getDeclaredTypeOfSymbol(enumSymbol);
65226522
var autoValue = 0;
@@ -6531,7 +6531,7 @@ module ts {
65316531
// If it is a constant value (not undefined), it is syntactically constrained to be a number.
65326532
// Also, we do not need to check this for ambients because there is already
65336533
// a syntax error if it is not a constant.
6534-
if (reportErrors) {
6534+
if (fullTypeCheck) {
65356535
checkTypeAssignableTo(checkExpression(initializer), enumType, initializer, /*chainedMessage*/ undefined, /*terminalMessage*/ undefined);
65366536
}
65376537
}
@@ -6545,9 +6545,7 @@ module ts {
65456545
}
65466546
});
65476547

6548-
if (reportErrors) {
6549-
nodeLinks.flags |= NodeCheckFlags.EnumValuesComputedAndChecked;
6550-
}
6548+
nodeLinks.flags |= NodeCheckFlags.EnumValuesComputed;
65516549
}
65526550
}
65536551

@@ -6561,7 +6559,7 @@ module ts {
65616559
checkCollistionWithRequireExportsInGeneratedCode(node, node.name);
65626560
checkExportsOnMergedDeclarations(node);
65636561

6564-
computeEnumMemberValues(node, /*reportErrors:*/ true);
6562+
computeEnumMemberValues(node);
65656563

65666564
// Spec 2014 - Section 9.3:
65676565
// It isn't possible for one enum declaration to continue the automatic numbering sequence of another,
@@ -7531,7 +7529,7 @@ module ts {
75317529
}
75327530

75337531
function getEnumMemberValue(node: EnumMember): number {
7534-
computeEnumMemberValues(<EnumDeclaration>node.parent, /*reportErrors:*/ false);
7532+
computeEnumMemberValues(<EnumDeclaration>node.parent);
75357533
return getNodeLinks(node).enumMemberValue;
75367534
}
75377535

src/compiler/types.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -801,16 +801,16 @@ module ts {
801801
}
802802

803803
export enum NodeCheckFlags {
804-
TypeChecked = 0x00000001, // Node has been type checked
805-
LexicalThis = 0x00000002, // Lexical 'this' reference
806-
CaptureThis = 0x00000004, // Lexical 'this' used in body
807-
EmitExtends = 0x00000008, // Emit __extends
808-
SuperInstance = 0x00000010, // Instance 'super' reference
809-
SuperStatic = 0x00000020, // Static 'super' reference
810-
ContextChecked = 0x00000040, // Contextual types have been assigned
804+
TypeChecked = 0x00000001, // Node has been type checked
805+
LexicalThis = 0x00000002, // Lexical 'this' reference
806+
CaptureThis = 0x00000004, // Lexical 'this' used in body
807+
EmitExtends = 0x00000008, // Emit __extends
808+
SuperInstance = 0x00000010, // Instance 'super' reference
809+
SuperStatic = 0x00000020, // Static 'super' reference
810+
ContextChecked = 0x00000040, // Contextual types have been assigned
811811

812812
// Values for enum members have been computed, and any errors have been reported for them.
813-
EnumValuesComputedAndChecked = 0x00000080,
813+
EnumValuesComputed = 0x00000080,
814814
}
815815

816816
export interface NodeLinks {

0 commit comments

Comments
 (0)