diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index b99d6d27d20..252f31a4989 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -5211,8 +5211,7 @@ module ts { var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor; var otherAccessor = getDeclarationOfKind(node.symbol, otherKind); if (otherAccessor) { - var visibilityFlags = NodeFlags.Private | NodeFlags.Public; - if (((node.flags & visibilityFlags) !== (otherAccessor.flags & visibilityFlags))) { + if (((node.flags & NodeFlags.AccessibilityModifier) !== (otherAccessor.flags & NodeFlags.AccessibilityModifier))) { error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility); } diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 317db201f3e..a2de8c19c47 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -1431,7 +1431,7 @@ module ts { function emitParameterPropertyAssignments(node: ConstructorDeclaration) { forEach(node.parameters, param => { - if (param.flags & (NodeFlags.Public | NodeFlags.Private)) { + if (param.flags & NodeFlags.AccessibilityModifier) { writeLine(); emitStart(param); emitStart(param.name); @@ -2630,7 +2630,7 @@ module ts { function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) { if (constructorDeclaration) { forEach(constructorDeclaration.parameters, param => { - if (param.flags & (NodeFlags.Public | NodeFlags.Private)) { + if (param.flags & NodeFlags.AccessibilityModifier) { emitPropertyDeclaration(param); } }); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 25ca24ae61b..06c215412e5 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -3213,7 +3213,7 @@ module ts { switch (modifierToken) { case SyntaxKind.PublicKeyword: - if (flags & NodeFlags.Private || flags & NodeFlags.Public) { + if (flags & NodeFlags.AccessibilityModifier) { grammarErrorAtPos(modifierStart, modifierLength, Diagnostics.Accessibility_modifier_already_seen); } else if (flags & NodeFlags.Static) { @@ -3226,7 +3226,7 @@ module ts { break; case SyntaxKind.PrivateKeyword: - if (flags & NodeFlags.Private || flags & NodeFlags.Public) { + if (flags & NodeFlags.AccessibilityModifier) { grammarErrorAtPos(modifierStart, modifierLength, Diagnostics.Accessibility_modifier_already_seen); } else if (flags & NodeFlags.Static) {