Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address code review: move checkGrammarAnySignature into checkSignatureDeclaration

Browse Source
This commit is contained in:
Yui T
2014-12-11 12:55:27 -08:00
parent 5fe2594ec2
commit c23b6a66e2
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/checker.ts
+12 -6
View File
@@ -6405,7 +6405,7 @@ module ts {
// Grammar checking
if (node.kind === SyntaxKind.ArrowFunction) {
checkGrammarFunctionLikeDeclaration(<FunctionLikeDeclaration>node);
checkGrammarAnySignatureDeclaration(<FunctionLikeDeclaration>node);
}
// The identityMapper object is used to indicate that function expressions are wildcards
@@ -7058,6 +7058,16 @@ module ts {
}
function checkSignatureDeclaration(node: SignatureDeclaration) {
// Grammar checking
if (node.kind === SyntaxKind.IndexSignature) {
checkGrammarIndexSignature(<SignatureDeclaration>node);
}
// TODO (yuisu): Remove this check in else-if when SyntaxKind.Construct is moved and ambient context is handled
else if (node.kind === SyntaxKind.FunctionType || node.kind === SyntaxKind.ConstructorType ||
node.kind === SyntaxKind.CallSignature || node.kind === SyntaxKind.ConstructSignature){
checkGrammarAnySignatureDeclaration(<FunctionLikeDeclaration>node);
}
checkTypeParameters(node.typeParameters);
forEach(node.parameters, checkParameter);
if (node.type) {
@@ -8765,12 +8775,8 @@ module ts {
case SyntaxKind.ConstructorType:
case SyntaxKind.CallSignature:
case SyntaxKind.ConstructSignature:
// Grammar checking
checkGrammarFunctionLikeDeclaration(<FunctionLikeDeclaration>node)
return checkSignatureDeclaration(<SignatureDeclaration>node);
case SyntaxKind.IndexSignature:
// Grammar checking
checkGrammarIndexSignature(<SignatureDeclaration>node);
return checkSignatureDeclaration(<SignatureDeclaration>node);
case SyntaxKind.MethodDeclaration:
case SyntaxKind.MethodSignature:
@@ -9829,7 +9835,7 @@ module ts {
}
}
function checkGrammarFunctionLikeDeclaration(node: FunctionLikeDeclaration) {
function checkGrammarAnySignatureDeclaration(node: FunctionLikeDeclaration) {
var hasGrammarErrorFromCheckModifierOrTypeParameterList = checkGrammarModifiers(node) ? true : checkGrammarTypeParameterList(node, node.typeParameters);
if (!hasGrammarErrorFromCheckModifierOrTypeParameterList) {
checkGrammarParameterList(node.parameters);