introduce CaseBlock as a block-scoped container for switch statements

This commit is contained in:
Vladimir Matveev committed 2015-03-10 17:50:54 -07:00
1 parent f747e5a1f9
commit efcf0e6f57
22 files changed
+389 -187

No files matched your search

+1 -1
View File
@@ -534,7 +534,7 @@ module ts {
case SyntaxKind.ForStatement:
case SyntaxKind.ForInStatement:
case SyntaxKind.ForOfStatement:
case SyntaxKind.SwitchStatement:
case SyntaxKind.CaseBlock:
bindChildren(node, 0, /*isBlockScopeContainer*/ true);
break;
default:
+2 -1
View File
@@ -9031,7 +9031,7 @@ module ts {
var hasDuplicateDefaultClause = false;
var expressionType = checkExpression(node.expression);
forEach(node.clauses, clause => {
forEach(node.caseBlock.clauses, clause => {
// Grammar check for duplicate default clauses, skip if we already report duplicate default clause
if (clause.kind === SyntaxKind.DefaultClause && !hasDuplicateDefaultClause) {
if (firstDefaultClause === undefined) {
@@ -10147,6 +10147,7 @@ module ts {
case SyntaxKind.BreakStatement:
case SyntaxKind.ReturnStatement:
case SyntaxKind.SwitchStatement:
case SyntaxKind.CaseBlock:
case SyntaxKind.CaseClause:
case SyntaxKind.DefaultClause:
case SyntaxKind.LabeledStatement:
+3 -3
View File
@@ -3541,10 +3541,10 @@ module ts {
write(" ");
emitToken(SyntaxKind.OpenBraceToken, endPos);
increaseIndent();
emitLines(node.clauses);
emitLines(node.caseBlock.clauses);
decreaseIndent();
writeLine();
emitToken(SyntaxKind.CloseBraceToken, node.clauses.end);
emitToken(SyntaxKind.CloseBraceToken, node.caseBlock.clauses.end);
}
function nodeStartPositionsAreOnSameLine(node1: Node, node2: Node) {
@@ -3938,7 +3938,7 @@ module ts {
}
switch (current.kind) {
case SyntaxKind.SourceFile:
case SyntaxKind.SwitchKeyword:
case SyntaxKind.CaseBlock:
case SyntaxKind.CatchClause:
case SyntaxKind.ModuleDeclaration:
case SyntaxKind.ForStatement:
+6 -2
View File
@@ -209,7 +209,9 @@ module ts {
visitNode(cbNode, (<WithStatement>node).statement);
case SyntaxKind.SwitchStatement:
return visitNode(cbNode, (<SwitchStatement>node).expression) ||
visitNodes(cbNodes, (<SwitchStatement>node).clauses);
visitNode(cbNode, (<SwitchStatement>node).caseBlock);
case SyntaxKind.CaseBlock:
return visitNodes(cbNodes, (<CaseBlock>node).clauses);
case SyntaxKind.CaseClause:
return visitNode(cbNode, (<CaseClause>node).expression) ||
visitNodes(cbNodes, (<CaseClause>node).statements);
@@ -3954,9 +3956,11 @@ module ts {
parseExpected(SyntaxKind.OpenParenToken);
node.expression = allowInAnd(parseExpression);
parseExpected(SyntaxKind.CloseParenToken);
var caseBlock = <CaseBlock>createNode(SyntaxKind.CaseBlock, scanner.getStartPos());
parseExpected(SyntaxKind.OpenBraceToken);
node.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
caseBlock.clauses = parseList(ParsingContext.SwitchClauses, /*checkForStrictMode*/ false, parseCaseOrDefaultClause);
parseExpected(SyntaxKind.CloseBraceToken);
node.caseBlock = finishNode(caseBlock);
return finishNode(node);
}
+5
View File
@@ -233,6 +233,7 @@ module ts {
EnumDeclaration,
ModuleDeclaration,
ModuleBlock,
CaseBlock,
ImportEqualsDeclaration,
ImportDeclaration,
ImportClause,
@@ -790,6 +791,10 @@ module ts {
export interface SwitchStatement extends Statement {
expression: Expression;
caseBlock: CaseBlock;
}
export interface CaseBlock extends Node {
clauses: NodeArray<CaseOrDefaultClause>;
}
+1
View File
@@ -376,6 +376,7 @@ module ts {
switch (node.kind) {
case SyntaxKind.ReturnStatement:
return visitor(<ReturnStatement>node);
case SyntaxKind.CaseBlock:
case SyntaxKind.Block:
case SyntaxKind.IfStatement:
case SyntaxKind.DoStatement: