diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts index 4f1f796e3e..c020aa84b2 100644 --- a/src/compiler/checker.ts +++ b/src/compiler/checker.ts @@ -1061,7 +1061,7 @@ module ts { function getTypeAliasForTypeLiteral(type: Type): Symbol { if (type.symbol && type.symbol.flags & SymbolFlags.TypeLiteral) { var node = type.symbol.declarations[0].parent; - while (node.kind === SyntaxKind.ParenType) { + while (node.kind === SyntaxKind.ParenthesizedType) { node = node.parent; } if (node.kind === SyntaxKind.TypeAliasDeclaration) { @@ -3041,8 +3041,8 @@ module ts { return getTypeFromTupleTypeNode(node); case SyntaxKind.UnionType: return getTypeFromUnionTypeNode(node); - case SyntaxKind.ParenType: - return getTypeFromTypeNode((node).type); + case SyntaxKind.ParenthesizedType: + return getTypeFromTypeNode((node).type); case SyntaxKind.FunctionType: case SyntaxKind.ConstructorType: case SyntaxKind.TypeLiteral: @@ -8402,8 +8402,8 @@ module ts { return checkTupleType(node); case SyntaxKind.UnionType: return checkUnionType(node); - case SyntaxKind.ParenType: - return checkSourceElement((node).type); + case SyntaxKind.ParenthesizedType: + return checkSourceElement((node).type); case SyntaxKind.FunctionDeclaration: return checkFunctionDeclaration(node); case SyntaxKind.Block: diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts index 810e913006..de3c5ca19c 100644 --- a/src/compiler/emitter.ts +++ b/src/compiler/emitter.ts @@ -518,8 +518,8 @@ module ts { return emitTupleType(type); case SyntaxKind.UnionType: return emitUnionType(type); - case SyntaxKind.ParenType: - return emitParenType(type); + case SyntaxKind.ParenthesizedType: + return emitParenType(type); case SyntaxKind.FunctionType: case SyntaxKind.ConstructorType: return emitSignatureDeclarationWithJsDocComments(type); @@ -583,7 +583,7 @@ module ts { emitSeparatedList(type.types, " | ", emitType); } - function emitParenType(type: ParenTypeNode) { + function emitParenType(type: ParenthesizedTypeNode) { write("("); emitType(type.type); write(")"); diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index 6b17338638..a1636357fe 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -253,8 +253,8 @@ module ts { return children((node).elementTypes); case SyntaxKind.UnionType: return children((node).types); - case SyntaxKind.ParenType: - return child((node).type); + case SyntaxKind.ParenthesizedType: + return child((node).type); case SyntaxKind.ArrayLiteral: return children((node).elements); case SyntaxKind.ObjectLiteral: @@ -1996,8 +1996,8 @@ module ts { return finishNode(node); } - function parseParenType(): ParenTypeNode { - var node = createNode(SyntaxKind.ParenType); + function parseParenType(): ParenthesizedTypeNode { + var node = createNode(SyntaxKind.ParenthesizedType); parseExpected(SyntaxKind.OpenParenToken); node.type = parseType(); parseExpected(SyntaxKind.CloseParenToken); diff --git a/src/compiler/types.ts b/src/compiler/types.ts index a118061786..242f6243a7 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -163,7 +163,7 @@ module ts { ArrayType, TupleType, UnionType, - ParenType, + ParenthesizedType, // Expression ArrayLiteral, ObjectLiteral, @@ -243,7 +243,7 @@ module ts { FirstFutureReservedWord = ImplementsKeyword, LastFutureReservedWord = YieldKeyword, FirstTypeNode = TypeReference, - LastTypeNode = ParenType, + LastTypeNode = ParenthesizedType, FirstPunctuation = OpenBraceToken, LastPunctuation = CaretEqualsToken, FirstToken = EndOfFileToken, @@ -425,7 +425,7 @@ module ts { types: NodeArray; } - export interface ParenTypeNode extends TypeNode { + export interface ParenthesizedTypeNode extends TypeNode { type: TypeNode; }