From c521fe434e274c30a138833282907f93e224cf5a Mon Sep 17 00:00:00 2001 From: Sheetal Nandi Date: Thu, 29 Jan 2015 16:27:33 -0800 Subject: [PATCH] Rename ImportStatement to ImportDeclaration --- src/compiler/parser.ts | 14 +++++++------- src/compiler/types.ts | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/compiler/parser.ts b/src/compiler/parser.ts index a808fb572f7..98d733acd17 100644 --- a/src/compiler/parser.ts +++ b/src/compiler/parser.ts @@ -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 = createNode(SyntaxKind.ImportStatement, fullStart); - setModifiers(importStatement, modifiers); + var 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"); } diff --git a/src/compiler/types.ts b/src/compiler/types.ts index 3d5696beec3..d1410240911 100644 --- a/src/compiler/types.ts +++ b/src/compiler/types.ts @@ -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; }