Skip to content

Commit 706ca8e

Browse files
committed
use NodeFlags.AccessibilityModifier in places where we need NodeFlags.Private | NodeFlags.Public
1 parent 1dc7ab0 commit 706ca8e

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

src/compiler/checker.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5211,8 +5211,7 @@ module ts {
52115211
var otherKind = node.kind === SyntaxKind.GetAccessor ? SyntaxKind.SetAccessor : SyntaxKind.GetAccessor;
52125212
var otherAccessor = <AccessorDeclaration>getDeclarationOfKind(node.symbol, otherKind);
52135213
if (otherAccessor) {
5214-
var visibilityFlags = NodeFlags.Private | NodeFlags.Public;
5215-
if (((node.flags & visibilityFlags) !== (otherAccessor.flags & visibilityFlags))) {
5214+
if (((node.flags & NodeFlags.AccessibilityModifier) !== (otherAccessor.flags & NodeFlags.AccessibilityModifier))) {
52165215
error(node.name, Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
52175216
}
52185217

src/compiler/emitter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,7 @@ module ts {
14311431

14321432
function emitParameterPropertyAssignments(node: ConstructorDeclaration) {
14331433
forEach(node.parameters, param => {
1434-
if (param.flags & (NodeFlags.Public | NodeFlags.Private)) {
1434+
if (param.flags & NodeFlags.AccessibilityModifier) {
14351435
writeLine();
14361436
emitStart(param);
14371437
emitStart(param.name);
@@ -2630,7 +2630,7 @@ module ts {
26302630
function emitParameterProperties(constructorDeclaration: ConstructorDeclaration) {
26312631
if (constructorDeclaration) {
26322632
forEach(constructorDeclaration.parameters, param => {
2633-
if (param.flags & (NodeFlags.Public | NodeFlags.Private)) {
2633+
if (param.flags & NodeFlags.AccessibilityModifier) {
26342634
emitPropertyDeclaration(param);
26352635
}
26362636
});

src/compiler/parser.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3213,7 +3213,7 @@ module ts {
32133213

32143214
switch (modifierToken) {
32153215
case SyntaxKind.PublicKeyword:
3216-
if (flags & NodeFlags.Private || flags & NodeFlags.Public) {
3216+
if (flags & NodeFlags.AccessibilityModifier) {
32173217
grammarErrorAtPos(modifierStart, modifierLength, Diagnostics.Accessibility_modifier_already_seen);
32183218
}
32193219
else if (flags & NodeFlags.Static) {
@@ -3226,7 +3226,7 @@ module ts {
32263226
break;
32273227

32283228
case SyntaxKind.PrivateKeyword:
3229-
if (flags & NodeFlags.Private || flags & NodeFlags.Public) {
3229+
if (flags & NodeFlags.AccessibilityModifier) {
32303230
grammarErrorAtPos(modifierStart, modifierLength, Diagnostics.Accessibility_modifier_already_seen);
32313231
}
32323232
else if (flags & NodeFlags.Static) {

0 commit comments

Comments
 (0)