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

Move type parameter error handling code to the grammar checker.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-11-19 16:55:18 -08:00
parent b2112f863a
commit 1a0f32213f
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/compiler/parser.ts
View File

@@ -855,23 +855,6 @@ module ts {
errorAtPos(start, length, message, arg0, arg1, arg2);
}
// This is just like createDiagnosticForNode except that it uses the current file
// being parsed instead of the file containing the node. This is because during
// parse, the nodes do not have parent pointers to get to the file.
//
// It is very intentional that we are not checking or changing the lookAheadMode value
// here. 'grammarErrorOnNode' is called when we are doing extra grammar checks and not
// when we are doing the actual parsing to determine what the user wrote. In other
// words, this function is called once we have already parsed the node, and are just
// applying some stricter checks on that node.
function grammarErrorOnNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): void {
var span = getErrorSpanForNode(node);
var start = span.end > span.pos ? skipTrivia(file.text, span.pos) : span.pos;
var length = span.end - start;
file.parseDiagnostics.push(createFileDiagnostic(file, start, length, message, arg0, arg1, arg2));
}
function grammarErrorAtPos(start: number, length: number, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): void {
file.parseDiagnostics.push(createFileDiagnostic(file, start, length, message, arg0, arg1, arg2));
}
@@ -1458,8 +1441,7 @@ module ts {
// <T extends "">
//
// We do *not* want to consume the > as we're consuming the expression for "".
var expr = parseUnaryExpression();
grammarErrorOnNode(expr, Diagnostics.Type_expected);
node.expression = parseUnaryExpression();
}
}
@@ -3762,6 +3744,7 @@ module ts {
case SyntaxKind.SwitchStatement: return visitSwitchStatement(<SwitchStatement>node);
case SyntaxKind.TaggedTemplateExpression: return visitTaggedTemplateExpression(<TaggedTemplateExpression>node);
case SyntaxKind.TupleType: return visitTupleType(<TupleTypeNode>node);
case SyntaxKind.TypeParameter: return visitTypeParameter(<TypeParameterDeclaration>node);
case SyntaxKind.TypeReference: return visitTypeReference(<TypeReferenceNode>node);
case SyntaxKind.VariableDeclaration: return visitVariableDeclaration(<VariableDeclaration>node);
case SyntaxKind.VariableStatement: return visitVariableStatement(<VariableStatement>node);
@@ -4467,6 +4450,12 @@ module ts {
}
}
function visitTypeParameter(node: TypeParameterDeclaration) {
if (node.expression) {
grammarErrorOnFirstToken(node.expression, Diagnostics.Type_expected);
}
}
function visitTypeReference(node: TypeReferenceNode) {
checkForAtLeastOneTypeArgument(node.typeArguments);
}

3
src/compiler/types.ts
View File

@@ -326,6 +326,9 @@ module ts {
export interface TypeParameterDeclaration extends Declaration {
name: Identifier;
constraint?: TypeNode;
// For error recovery purposes.
expression?: Expression;
}
export interface SignatureDeclaration extends Declaration, ParsedSignature { }

2
tests/baselines/reference/typeParameterConstraints1.errors.txt
View File

@@ -23,7 +23,7 @@ tests/cases/compiler/typeParameterConstraints1.ts(12,26): error TS2304: Cannot f
~
!!! error TS1110: Type expected.
function foo10<T extends (1)> (test: T) { }
~~~
~
!!! error TS1110: Type expected.
function foo11<T extends null> (test: T) { }
~~~~