Skip to content

Commit dae3487

Browse files
DanielRosenwasserDanielRosenwasser
committed
Minor CR feedback addressed.
1 parent d98a11e commit dae3487

File tree

6 files changed

+33
-32
lines changed

6 files changed

+33
-32
lines changed

‎src/compiler/checker.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5815,7 +5815,7 @@ module ts {
58155815
});
58165816
}
58175817

5818-
function checkLabelledStatement(node: LabelledStatement) {
5818+
function checkLabelledStatement(node: LabeledStatement) {
58195819
checkSourceElement(node.statement);
58205820
}
58215821

@@ -6378,8 +6378,8 @@ module ts {
63786378
return checkWithStatement(<WithStatement>node);
63796379
case SyntaxKind.SwitchStatement:
63806380
return checkSwitchStatement(<SwitchStatement>node);
6381-
case SyntaxKind.LabelledStatement:
6382-
return checkLabelledStatement(<LabelledStatement>node);
6381+
case SyntaxKind.LabeledStatement:
6382+
return checkLabelledStatement(<LabeledStatement>node);
63836383
case SyntaxKind.ThrowStatement:
63846384
return checkThrowStatement(<ThrowStatement>node);
63856385
case SyntaxKind.TryStatement:

‎src/compiler/emitter.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ module ts {
781781
case SyntaxKind.ContinueStatement:
782782
case SyntaxKind.ExportAssignment:
783783
return false;
784-
case SyntaxKind.LabelledStatement:
785-
return (<LabelledStatement>node.parent).label === node;
784+
case SyntaxKind.LabeledStatement:
785+
return (<LabeledStatement>node.parent).label === node;
786786
case SyntaxKind.CatchBlock:
787787
return (<CatchBlock>node.parent).variable === node;
788788
}
@@ -1200,7 +1200,7 @@ module ts {
12001200
write(";");
12011201
}
12021202

1203-
function emitLabelledStatement(node: LabelledStatement) {
1203+
function emitLabelledStatement(node: LabeledStatement) {
12041204
emit(node.label);
12051205
write(": ");
12061206
emit(node.statement);
@@ -2080,8 +2080,8 @@ module ts {
20802080
case SyntaxKind.CaseClause:
20812081
case SyntaxKind.DefaultClause:
20822082
return emitCaseOrDefaultClause(<CaseOrDefaultClause>node);
2083-
case SyntaxKind.LabelledStatement:
2084-
return emitLabelledStatement(<LabelledStatement>node);
2083+
case SyntaxKind.LabeledStatement:
2084+
return emitLabelledStatement(<LabeledStatement>node);
20852085
case SyntaxKind.ThrowStatement:
20862086
return emitThrowStatement(<ThrowStatement>node);
20872087
case SyntaxKind.TryStatement:

‎src/compiler/parser.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -305,9 +305,9 @@ module ts {
305305
case SyntaxKind.DefaultClause:
306306
return child((<CaseOrDefaultClause>node).expression) ||
307307
children((<CaseOrDefaultClause>node).statements);
308-
case SyntaxKind.LabelledStatement:
309-
return child((<LabelledStatement>node).label) ||
310-
child((<LabelledStatement>node).statement);
308+
case SyntaxKind.LabeledStatement:
309+
return child((<LabeledStatement>node).label) ||
310+
child((<LabeledStatement>node).statement);
311311
case SyntaxKind.ThrowStatement:
312312
return child((<ThrowStatement>node).expression);
313313
case SyntaxKind.TryStatement:
@@ -371,7 +371,7 @@ module ts {
371371
case SyntaxKind.SwitchStatement:
372372
case SyntaxKind.CaseClause:
373373
case SyntaxKind.DefaultClause:
374-
case SyntaxKind.LabelledStatement:
374+
case SyntaxKind.LabeledStatement:
375375
case SyntaxKind.TryStatement:
376376
case SyntaxKind.TryBlock:
377377
case SyntaxKind.CatchBlock:
@@ -2799,8 +2799,8 @@ module ts {
27992799
return isIdentifier() && lookAhead(() => nextToken() === SyntaxKind.ColonToken);
28002800
}
28012801

2802-
function parseLabelledStatement(): LabelledStatement {
2803-
var node = <LabelledStatement>createNode(SyntaxKind.LabelledStatement);
2802+
function parseLabelledStatement(): LabeledStatement {
2803+
var node = <LabeledStatement>createNode(SyntaxKind.LabeledStatement);
28042804
node.label = parseIdentifier();
28052805
parseExpected(SyntaxKind.ColonToken);
28062806

‎src/compiler/types.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ module ts {
183183
SwitchStatement,
184184
CaseClause,
185185
DefaultClause,
186-
LabelledStatement,
186+
LabeledStatement,
187187
ThrowStatement,
188188
TryStatement,
189189
TryBlock,
@@ -459,7 +459,7 @@ module ts {
459459
statements: NodeArray<Statement>;
460460
}
461461

462-
export interface LabelledStatement extends Statement {
462+
export interface LabeledStatement extends Statement {
463463
label: Identifier;
464464
statement: Statement;
465465
}

‎src/harness/typeWriter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class TypeWriterWalker {
6767
case ts.SyntaxKind.ContinueStatement:
6868
case ts.SyntaxKind.BreakStatement:
6969
return (<ts.BreakOrContinueStatement>parent).label === identifier;
70-
case ts.SyntaxKind.LabelledStatement:
71-
return (<ts.LabelledStatement>parent).label === identifier;
70+
case ts.SyntaxKind.LabeledStatement:
71+
return (<ts.LabeledStatement>parent).label === identifier;
7272
}
7373
return false;
7474
}

‎src/services/services.ts

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,8 +1276,8 @@ module ts {
12761276
/// Helpers
12771277
function getTargetLabel(referenceNode: Node, labelName: string): Identifier {
12781278
while (referenceNode) {
1279-
if (referenceNode.kind === SyntaxKind.LabelledStatement && (<LabelledStatement>referenceNode).label.text === labelName) {
1280-
return (<LabelledStatement>referenceNode).label;
1279+
if (referenceNode.kind === SyntaxKind.LabeledStatement && (<LabeledStatement>referenceNode).label.text === labelName) {
1280+
return (<LabeledStatement>referenceNode).label;
12811281
}
12821282
referenceNode = referenceNode.parent;
12831283
}
@@ -1292,17 +1292,17 @@ module ts {
12921292

12931293
function isLabelOfLabeledStatement(node: Node): boolean {
12941294
return node.kind === SyntaxKind.Identifier &&
1295-
node.parent.kind === SyntaxKind.LabelledStatement &&
1296-
(<LabelledStatement>node.parent).label === node;
1295+
node.parent.kind === SyntaxKind.LabeledStatement &&
1296+
(<LabeledStatement>node.parent).label === node;
12971297
}
12981298

12991299
/**
13001300
* Whether or not a 'node' is preceded by a label of the given string.
13011301
* Note: 'node' cannot be a SourceFile.
13021302
*/
1303-
function isLabelledBy(node: Node, labelName: string) {
1304-
for (var owner = node.parent; owner.kind === SyntaxKind.LabelledStatement; owner = owner.parent) {
1305-
if ((<LabelledStatement>owner).label.text === labelName) {
1303+
function isLabeledBy(node: Node, labelName: string) {
1304+
for (var owner = node.parent; owner.kind === SyntaxKind.LabeledStatement; owner = owner.parent) {
1305+
if ((<LabeledStatement>owner).label.text === labelName) {
13061306
return true;
13071307
}
13081308
}
@@ -2372,13 +2372,13 @@ module ts {
23722372
case SyntaxKind.WhileStatement:
23732373
// The iteration statement is the owner if the break/continue statement is either unlabeled,
23742374
// or if the break/continue statement's label corresponds to one of the loop's labels.
2375-
if (!breakOrContinueStatement.label || isLabelledBy(owner, breakOrContinueStatement.label.text)) {
2375+
if (!breakOrContinueStatement.label || isLabeledBy(owner, breakOrContinueStatement.label.text)) {
23762376
return getLoopBreakContinueOccurrences(<IterationStatement>owner)
23772377
}
23782378
break;
23792379
case SyntaxKind.SwitchStatement:
23802380
// A switch statement can only be the owner of an break statement.
2381-
if (breakOrContinueStatement.kind === SyntaxKind.BreakStatement && (!breakOrContinueStatement.label || isLabelledBy(owner, breakOrContinueStatement.label.text))) {
2381+
if (breakOrContinueStatement.kind === SyntaxKind.BreakStatement && (!breakOrContinueStatement.label || isLabeledBy(owner, breakOrContinueStatement.label.text))) {
23822382
return getSwitchCaseDefaultOccurrences(<SwitchStatement>owner);
23832383
}
23842384
break;
@@ -2398,7 +2398,10 @@ module ts {
23982398
breakSearchType: BreakContinueSearchType,
23992399
continueSearchType: BreakContinueSearchType,
24002400
keywordAccumulator: Node[]): void {
2401-
(function aggregate(node: Node) {
2401+
2402+
return aggregate(startPoint);
2403+
2404+
function aggregate(node: Node): void {
24022405
// Remember the statuses of the flags before diving into the next node.
24032406
var prevBreakSearchType = breakSearchType;
24042407
var prevContinueSearchType = continueSearchType;
@@ -2432,9 +2435,7 @@ module ts {
24322435
// Restore the last state.
24332436
breakSearchType = prevBreakSearchType;
24342437
continueSearchType = prevContinueSearchType;
2435-
})(startPoint);
2436-
2437-
return;
2438+
};
24382439
}
24392440

24402441
// Note: 'statement' must be a descendant of 'root'.
@@ -2449,7 +2450,7 @@ module ts {
24492450
continueSearchType;
24502451

24512452
if (statement.label && (searchType & BreakContinueSearchType.Labeled)) {
2452-
return isLabelledBy(owner, statement.label.text);
2453+
return isLabeledBy(owner, statement.label.text);
24532454
}
24542455
else {
24552456
return !!(searchType & BreakContinueSearchType.Unlabeled);

0 commit comments

Comments
 (0)