microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-19 20:37:00 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Renamed functions, removed the duplicates found from renaming.

Browse Source
This commit is contained in:
Daniel Rosenwasser
2015-06-03 13:51:53 -07:00
parent 3fe308d2a6
commit 64a31e2e51
1 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/compiler/parser.ts
View File

@@ -2688,7 +2688,7 @@ module ts {
function nextTokenIsIdentifierOnSameLine() {
nextToken();
return !scanner.hasPrecedingLineBreak() && isIdentifier()
return !scanner.hasPrecedingLineBreak() && isIdentifier();
}
function parseYieldExpression(): YieldExpression {
@@ -4009,18 +4009,18 @@ module ts {
// as the identifier 'namespace' on one line followed by the identifier 'n' on another.
// We need to look one token ahead to see if it permissible to try parsing a declaration.
case SyntaxKind.DeclareKeyword:
if (lookAhead(isFollowedByIdentifierOrKeywordOnSameLine) && getDeclarationFlags() & flags) {
if (lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine) && getDeclarationFlags() & flags) {
return parseDeclaration();
}
break;
case SyntaxKind.ModuleKeyword:
if (lookAhead(isFollowedByIdentifierOrStringOnSameLine) && getDeclarationFlags() & flags) {
if (lookAhead(nextTokenIsIdentifierOrStringLiteralOnSameLine) && getDeclarationFlags() & flags) {
return parseDeclaration();
}
break;
case SyntaxKind.NamespaceKeyword:
case SyntaxKind.TypeKeyword:
if (lookAhead(isFollowedByIdentifierOnSameLine) && getDeclarationFlags() & flags) {
if (lookAhead(nextTokenIsIdentifierOnSameLine) && getDeclarationFlags() & flags) {
return parseDeclaration();
}
break;
@@ -4070,21 +4070,11 @@ module ts {
}
}
function isFollowedByIdentifierOrKeywordOnSameLine() {
nextToken();
return !scanner.hasPrecedingLineBreak() && isIdentifierOrKeyword();
}
function isFollowedByIdentifierOrStringOnSameLine() {
function nextTokenIsIdentifierOrStringLiteralOnSameLine() {
nextToken();
return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === SyntaxKind.StringLiteral);
}
function isFollowedByIdentifierOnSameLine() {
nextToken();
return !scanner.hasPrecedingLineBreak() && isIdentifier();
}
function parseFunctionBlockOrSemicolon(isGenerator: boolean, diagnosticMessage?: DiagnosticMessage): Block {
if (token !== SyntaxKind.OpenBraceToken && canParseSemicolon()) {
parseSemicolon();