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

Merge property assignment parsing code.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-12-02 22:12:50 -08:00
parent a8badd921e
commit ff328b0d54
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/parser.ts
View File

@@ -3166,8 +3166,14 @@ module ts {
return finishNode(node);
}
function parseShortOrLonghandPropertyAssignment(): PropertyAssignment {
function parsePropertyAssignment(): PropertyAssignment {
var nodePos = scanner.getStartPos();
var initialToken = token;
if (parseContextualModifier(SyntaxKind.GetKeyword) || parseContextualModifier(SyntaxKind.SetKeyword)) {
var kind = initialToken === SyntaxKind.GetKeyword ? SyntaxKind.GetAccessor : SyntaxKind.SetAccessor;
return parseAccessorDeclaration(kind, nodePos, /*modifiers*/undefined);
}
var asteriskToken = parseOptionalToken(SyntaxKind.AsteriskToken);
var tokenIsIdentifier = isIdentifier();
@@ -3208,16 +3214,6 @@ module ts {
}
}
function parsePropertyAssignment(): PropertyAssignment {
var initialPos = getNodePos();
var initialToken = token;
if (parseContextualModifier(SyntaxKind.GetKeyword) || parseContextualModifier(SyntaxKind.SetKeyword)) {
var kind = initialToken === SyntaxKind.GetKeyword ? SyntaxKind.GetAccessor : SyntaxKind.SetAccessor;
return parseAccessorDeclaration(kind, initialPos, /*modifiers*/ undefined);
}
return parseShortOrLonghandPropertyAssignment();
}
function parseObjectLiteralExpression(): ObjectLiteralExpression {
var node = <ObjectLiteralExpression>createNode(SyntaxKind.ObjectLiteralExpression);
parseExpected(SyntaxKind.OpenBraceToken);