microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-16 05:58:32 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

hoist source level module declarations

Browse Source
This commit is contained in:
Vladimir Matveev 2015-04-11 06:33:09 -07:00
parent 442addecf5
commit a281cad492
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/compiler/emitter.ts
View File

@ -4327,15 +4327,18 @@ var __param = this.__param || function(index, decorator) { return function (targ
return emitOnlyPinnedOrTripleSlashComments(node);
}
emitStart(node);
if (isES6ExportedDeclaration(node)) {
write("export ");
let hoistedInDeclarationScope = currentFileIsEmittedAsSystemModule() && isSourceFileLevelDeclaration(node)
if (!hoistedInDeclarationScope) {
emitStart(node);
if (isES6ExportedDeclaration(node)) {
write("export ");
}
write("var ");
emit(node.name);
write(";");
emitEnd(node);
writeLine();
}
write("var ");
emit(node.name);
write(";");
emitEnd(node);
writeLine();
emitStart(node);
write("(function (");
emitStart(node.name);
@ -4378,6 +4381,14 @@ var __param = this.__param || function(index, decorator) { return function (targ
write(" = {}));");
emitEnd(node);
if (!isES6ExportedDeclaration(node) && node.name.kind === SyntaxKind.Identifier && node.parent === currentSourceFile) {
if (currentFileIsEmittedAsSystemModule() && node.flags & NodeFlags.Export) {
writeLine();
write(`${exportFunctionForFile}("`);
emitDeclarationName(node);
write(`", `);
emitDeclarationName(node);
write(")");
}
emitExportMemberAssignments(<Identifier>node.name);
}
}
@ -4829,7 +4840,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
}
function hoistTopLevelVariableAndFunctionDeclarations(node: SourceFile): void {
let hoistedVars: (Identifier | ClassDeclaration)[];
let hoistedVars: (Identifier | ClassDeclaration | ModuleDeclaration)[];
let hoistedFunctionDeclarations: FunctionDeclaration[];
visit(node);
@ -4842,7 +4853,7 @@ var __param = this.__param || function(index, decorator) { return function (targ
if (i !== 0) {
write(", ");
}
if (local.kind === SyntaxKind.ClassDeclaration) {
if (local.kind === SyntaxKind.ClassDeclaration || local.kind === SyntaxKind.ModuleDeclaration) {
emitDeclarationName(<ClassDeclaration>local);
}
else {
@ -4871,6 +4882,11 @@ var __param = this.__param || function(index, decorator) { return function (targ
return;
}
if (node.kind === SyntaxKind.ModuleDeclaration && shouldEmitModuleDeclaration(<ModuleDeclaration>node)) {
(hoistedVars || (hoistedVars = [])).push(<ModuleDeclaration>node);
return;
}
if (node.kind === SyntaxKind.VariableDeclaration || node.kind === SyntaxKind.BindingElement) {
let name = (<VariableDeclaration | BindingElement>node).name;
if (name.kind === SyntaxKind.Identifier) {