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

Don't directly create errors when parsing expressions.

Browse Source
This commit is contained in:
Cyrus Najmabadi
2014-12-01 00:57:48 -08:00
parent 94febee138
commit 08d3e4a90e
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/compiler/parser.ts
View File

@@ -1272,7 +1272,7 @@ module ts {
// An identifier that starts with two underscores has an extra underscore character prepended to it to avoid issues
// with magic property names like '__proto__'. The 'identifiers' object is used to share a single string instance for
// each identifier in order to reduce memory consumption.
function createIdentifier(isIdentifier: boolean): Identifier {
function createIdentifier(isIdentifier: boolean, diagnosticMessage?: DiagnosticMessage): Identifier {
identifierCount++;
if (isIdentifier) {
var node = <Identifier>createNode(SyntaxKind.Identifier);
@@ -1280,14 +1280,18 @@ module ts {
nextToken();
return finishNode(node);
}
error(Diagnostics.Identifier_expected);
error(diagnosticMessage || Diagnostics.Identifier_expected);
return createMissingIdentifier();
}
function createMissingIdentifier() {
var node = <Identifier>createMissingNode();
node.text = "";
return node;
}
function parseIdentifier(): Identifier {
return createIdentifier(isIdentifier());
function parseIdentifier(diagnosticMessage?: DiagnosticMessage): Identifier {
return createIdentifier(isIdentifier(), diagnosticMessage);
}
function parseIdentifierName(): Identifier {
@@ -1677,8 +1681,7 @@ module ts {
}
else {
parseExpected(SyntaxKind.CloseBraceToken);
literal = <LiteralExpression>createMissingNode();
literal.text = "";
literal = createMissingIdentifier();
}
span.literal = literal;
@@ -3032,14 +3035,9 @@ module ts {
break;
case SyntaxKind.TemplateHead:
return parseTemplateExpression();
default:
if (isIdentifier()) {
return parseIdentifier();
}
}
error(Diagnostics.Expression_expected);
return <PrimaryExpression>createMissingNode();
return parseIdentifier(Diagnostics.Expression_expected);
}
function parseParenthesizedExpression(): ParenthesizedExpression {