microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-31 08:07:10 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Provide greater type safety in the ast system.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-12-01 18:42:07 -08:00
parent afa198e9fa
commit a29862eea5
4 changed files with 84 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/compiler/parser.ts
View File

@@ -1665,8 +1665,8 @@ module ts {
return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
}
function parseTokenNode(): PrimaryExpression {
var node = <PrimaryExpression>createNode(token);
function parseTokenNode<T extends Node>(): T {
var node = <T>createNode(token);
nextToken();
return finishNode(node);
}
@@ -1789,10 +1789,14 @@ module ts {
}
}
function parseParameterType(): TypeNode {
return parseOptional(SyntaxKind.ColonToken)
? token === SyntaxKind.StringLiteral ? parseLiteralNode(/*internName:*/ true) : parseType()
: undefined;
function parseParameterType(): TypeNode | StringLiteralExpression {
if (parseOptional(SyntaxKind.ColonToken)) {
return token === SyntaxKind.StringLiteral
? <StringLiteralExpression>parseLiteralNode(/*internName:*/ true)
: parseType();
}
return undefined;
}
function isStartOfParameter(): boolean {
@@ -2095,15 +2099,15 @@ module ts {
return finishNode(node);
}
function parseFunctionType(typeKind: SyntaxKind): SignatureDeclaration {
var node = <SignatureDeclaration>createNode(typeKind);
function parseFunctionType(typeKind: SyntaxKind): FunctionOrConstructorTypeNode {
var node = <FunctionOrConstructorTypeNode>createNode(typeKind);
fillSignature(typeKind === SyntaxKind.FunctionType ? SyntaxKind.CallSignature : SyntaxKind.ConstructSignature,
SyntaxKind.EqualsGreaterThanToken, /* returnTokenRequired */ true, /*yieldAndGeneratorParameterContext:*/ false, node);
return finishNode(node);
}
function parseKeywordAndNoDot(): Node {
var node = parseTokenNode();
function parseKeywordAndNoDot(): TypeNode {
var node = parseTokenNode<TypeNode>();
return token === SyntaxKind.DotToken ? undefined : node;
}
@@ -2117,7 +2121,7 @@ module ts {
var node = tryParse(parseKeywordAndNoDot);
return node || parseTypeReference();
case SyntaxKind.VoidKeyword:
return parseTokenNode();
return parseTokenNode<TypeNode>();
case SyntaxKind.TypeOfKeyword:
return parseTypeQuery();
case SyntaxKind.OpenBraceToken:
@@ -2888,7 +2892,7 @@ module ts {
}
function parseSuperExpression(): MemberExpression {
var expression = parseTokenNode();
var expression = parseTokenNode<PrimaryExpression>();
if (token === SyntaxKind.OpenParenToken || token === SyntaxKind.DotToken) {
return expression;
}
@@ -3025,7 +3029,7 @@ module ts {
case SyntaxKind.NullKeyword:
case SyntaxKind.TrueKeyword:
case SyntaxKind.FalseKeyword:
return parseTokenNode();
return parseTokenNode<PrimaryExpression>();
case SyntaxKind.NumericLiteral:
case SyntaxKind.StringLiteral:
case SyntaxKind.NoSubstitutionTemplateLiteral: