microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-10 15:25:54 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Extract out common code from the list parsers.

Browse Source
This commit is contained in:
Cyrus Najmabadi 2014-12-01 01:10:21 -08:00
parent 08d3e4a90e
commit 4db6d3136c
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/compiler/parser.ts
View File

@ -1280,6 +1280,7 @@ module ts {
nextToken();
return finishNode(node);
}
error(diagnosticMessage || Diagnostics.Identifier_expected);
return createMissingIdentifier();
}
@ -1490,12 +1491,14 @@ module ts {
var result = <NodeArray<T>>[];
result.pos = getNodePos();
var savedStrictModeContext = inStrictModeContext();
while (!isListTerminator(kind)) {
if (isListElement(kind, /* inErrorRecovery */ false)) {
var element = parseElement();
result.push(element);
// test elements only if we are not already in strict mode
if (!inStrictModeContext() && checkForStrictMode) {
if (checkForStrictMode && !inStrictModeContext()) {
if (isPrologueDirective(element)) {
if (isUseStrictPrologueDirective(element)) {
setStrictModeContext(true);
@ -1506,21 +1509,32 @@ module ts {
checkForStrictMode = false;
}
}
continue;
}
else {
error(parsingContextErrors(kind));
if (isInSomeParsingContext()) {
break;
}
nextToken();
if (abortParsingListOrMoveToNextToken(kind)) {
break;
}
}
setStrictModeContext(savedStrictModeContext);
result.end = getNodeEnd();
parsingContext = saveParsingContext;
return result;
}
// Returns true if we should abort parsing.
function abortParsingListOrMoveToNextToken(kind: ParsingContext) {
error(parsingContextErrors(kind));
if (isInSomeParsingContext()) {
return true;
}
nextToken();
return false;
}
// Parses a comma-delimited list of elements
function parseDelimitedList<T extends Node>(kind: ParsingContext, parseElement: () => T): NodeArray<T> {
var saveParsingContext = parsingContext;
@ -1541,16 +1555,15 @@ module ts {
break;
}
parseExpected(SyntaxKind.CommaToken);
continue;
}
else if (isListTerminator(kind)) {
if (isListTerminator(kind)) {
break;
}
else {
error(parsingContextErrors(kind));
if (isInSomeParsingContext()) {
break;
}
nextToken();
if (abortParsingListOrMoveToNextToken(kind)) {
break;
}
}