microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 21:36:50 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Move tuple checks to the grammar checker.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-11-19 14:38:53 -08:00
parent 47c95c48b4
commit 90b7a1c40a
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/parser.ts
View File

@@ -1639,12 +1639,7 @@ module ts {
function parseTupleType(): TupleTypeNode {
var node = <TupleTypeNode>createNode(SyntaxKind.TupleType);
var startTokenPos = scanner.getTokenPos();
var startErrorCount = file.parseDiagnostics.length;
node.elementTypes = parseBracketedList(ParsingContext.TupleElementTypes, parseType, SyntaxKind.OpenBracketToken, SyntaxKind.CloseBracketToken);
if (!node.elementTypes.length && file.parseDiagnostics.length === startErrorCount) {
grammarErrorAtPos(startTokenPos, scanner.getStartPos() - startTokenPos, Diagnostics.A_tuple_type_element_list_cannot_be_empty);
}
return finishNode(node);
}
@@ -4422,7 +4417,14 @@ module ts {
}
function visitTupleType(node: TupleTypeNode) {
checkForTrailingComma(node.elementTypes);
checkForTrailingComma(node.elementTypes) ||
checkForAtLeastOneType(node);
}
function checkForAtLeastOneType(node: TupleTypeNode): boolean {
if (node.elementTypes.length === 0) {
return grammarErrorOnNode(node, Diagnostics.A_tuple_type_element_list_cannot_be_empty)
}
}
function visitTypeReference(node: TypeReferenceNode) {