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

Rename ImportStatement to ImportDeclaration

Browse Source
This commit is contained in:
Sheetal Nandi
2015-01-29 16:27:33 -08:00
parent 484144bf98
commit c521fe434e
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/parser.ts
View File

@@ -4529,7 +4529,7 @@ module ts {
token === SyntaxKind.FromKeyword;
}
function parseImportDeclarationOrStatement(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportStatement {
function parseImportDeclarationOrImportEqualsDeclaration(fullStart: number, modifiers: ModifiersArray): ImportEqualsDeclaration | ImportDeclaration {
parseExpected(SyntaxKind.ImportKeyword);
var identifier: Identifier;
if (isIdentifier()) {
@@ -4549,8 +4549,8 @@ module ts {
}
// Import statement
var importStatement = <ImportStatement>createNode(SyntaxKind.ImportStatement, fullStart);
setModifiers(importStatement, modifiers);
var importDeclaration = <ImportDeclaration>createNode(SyntaxKind.ImportDeclaration, fullStart);
setModifiers(importDeclaration, modifiers);
// ImportDeclaration:
// import ImportClause from ModuleSpecifier ;
@@ -4579,13 +4579,13 @@ module ts {
importClause.namedBindings = token === SyntaxKind.AsteriskToken ? parseNamespaceImport() : parseNamedImports();
}
importStatement.importClause = finishNode(importClause);
importDeclaration.importClause = finishNode(importClause);
parseExpected(SyntaxKind.FromKeyword);
}
importStatement.moduleSpecifier = parseModuleSpecifier();
importDeclaration.moduleSpecifier = parseModuleSpecifier();
parseSemicolon();
return finishNode(importStatement);
return finishNode(importDeclaration);
}
function parseModuleReference() {
@@ -4783,7 +4783,7 @@ module ts {
case SyntaxKind.ModuleKeyword:
return parseModuleDeclaration(fullStart, modifiers);
case SyntaxKind.ImportKeyword:
return parseImportDeclarationOrStatement(fullStart, modifiers);
return parseImportDeclarationOrImportEqualsDeclaration(fullStart, modifiers);
default:
Debug.fail("Mismatch between isDeclarationStart and parseDeclaration");
}

4
src/compiler/types.ts
View File

@@ -232,7 +232,7 @@ module ts {
ModuleBlock,
ImportEqualsDeclaration,
ExportAssignment,
ImportStatement,
ImportDeclaration,
ImportClause,
NamespaceImport,
NamedImports,
@@ -872,7 +872,7 @@ module ts {
// import "mod" => importClause = undefined, moduleSpecifier = "mod"
// In rest of the cases, module specifier is string literal corresponding to module
// ImportClause information is shown at its declaration below.
export interface ImportStatement extends Statement, ModuleElement {
export interface ImportDeclaration extends Statement, ModuleElement {
importClause?: ImportClause;
moduleSpecifier: StringLiteralExpression;
}