maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Ensure const enum members with same value have same type identity

Browse source
This commit is contained in:
Anders Hejlsberg 2016-07-01 09:18:43 -07:00
parent 70e2c43d28
commit d37d50afb0
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/compiler/checker.ts
View file

@ -3667,12 +3667,23 @@ namespace ts {
return links.declaredType;
}
function createEnumType(symbol: Symbol): Type {
const type = createType(TypeFlags.Enum);
type.symbol = symbol;
return type;
}
function getEnumMemberType(symbol: Symbol): Type {
const links = getSymbolLinks(getParentOfSymbol(symbol));
const map = links.enumMemberTypes || (links.enumMemberTypes = {});
const value = "" + getEnumMemberValue(<EnumMember>symbol.valueDeclaration);
return map[value] || (map[value] = createEnumType(symbol));
}
function getDeclaredTypeOfEnum(symbol: Symbol): Type {
const links = getSymbolLinks(symbol);
if (!links.declaredType) {
const type = createType(TypeFlags.Enum);
type.symbol = symbol;
links.declaredType = type;
links.declaredType = symbol.flags & SymbolFlags.EnumMember ? getEnumMemberType(symbol) : createEnumType(symbol);
}
return links.declaredType;
}

1
src/compiler/types.ts
View file

@ -2136,6 +2136,7 @@ namespace ts {
isDeclarationWithCollidingName?: boolean; // True if symbol is block scoped redeclaration
bindingElement?: BindingElement; // Binding element associated with property symbol
exportsSomeValue?: boolean; // True if module exports some value (not just types)
enumMemberTypes?: Map<Type>; // Enum member types indexed by enum value
}
/* @internal */