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

Use an enum in checkClassForDuplicateDeclarations to aid readability

Browse source
This commit is contained in:
Andy Hanson 2016-08-15 11:16:36 -07:00
parent 75cb595f10
commit 2953c7f0b2
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/checker.ts
View file

@ -13794,15 +13794,19 @@ namespace ts {
}
function checkClassForDuplicateDeclarations(node: ClassLikeDeclaration) {
const getter = 1, setter = 2, property = getter | setter;
const enum Meaning {
Getter = 1,
Setter = 2,
Property = Getter | Setter
}
const instanceNames = createMap<number>();
const staticNames = createMap<number>();
const instanceNames = createMap<Meaning>();
const staticNames = createMap<Meaning>();
for (const member of node.members) {
if (member.kind === SyntaxKind.Constructor) {
for (const param of (member as ConstructorDeclaration).parameters) {
if (isParameterPropertyDeclaration(param)) {
addName(instanceNames, param.name, (param.name as Identifier).text, property);
addName(instanceNames, param.name, (param.name as Identifier).text, Meaning.Property);
}
}
}
@ -13814,22 +13818,22 @@ namespace ts {
if (memberName) {
switch (member.kind) {
case SyntaxKind.GetAccessor:
addName(names, member.name, memberName, getter);
addName(names, member.name, memberName, Meaning.Getter);
break;
case SyntaxKind.SetAccessor:
addName(names, member.name, memberName, setter);
addName(names, member.name, memberName, Meaning.Setter);
break;
case SyntaxKind.PropertyDeclaration:
addName(names, member.name, memberName, property);
addName(names, member.name, memberName, Meaning.Property);
break;
}
}
}
}
function addName(names: Map<number>, location: Node, name: string, meaning: number) {
function addName(names: Map<Meaning>, location: Node, name: string, meaning: Meaning) {
const prev = names[name];
if (prev) {
if (prev & meaning) {