Remove references with exports.id as es6 module doesnt have exports.id

Conflicts:
	tests/baselines/reference/es6ExportAll.js
	tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js
	tests/baselines/reference/es6ImportNamedImport.js
This commit is contained in:
Sheetal Nandi
2015-02-17 13:47:15 -08:00
committed by Mohamed Hegazy
parent 4b7548487c
commit 006ed82730
13 changed files with 34 additions and 22 deletions
+7 -1
View File
@@ -10817,7 +10817,13 @@ module ts {
function getExportNameSubstitution(symbol: Symbol, location: Node): string {
if (isExternalModuleSymbol(symbol.parent)) {
return "exports." + unescapeIdentifier(symbol.name);
var symbolName = unescapeIdentifier(symbol.name);
if (languageVersion >= ScriptTarget.ES6) {
return symbolName;
}
else {
return "exports." + symbolName;
}
}
var node = location;
var containerSymbol = getParentOfSymbol(symbol);
+8 -2
View File
@@ -3810,8 +3810,14 @@ module ts {
function emitModuleMemberName(node: Declaration) {
emitStart(node.name);
if (getCombinedNodeFlags(node) & NodeFlags.Export) {
emitContainingModuleName(node);
write(".");
var container = getContainingModule(node);
if (container) {
write(resolver.getGeneratedNameForNode(container));
write(".");
}
else if (languageVersion < ScriptTarget.ES6) {
write("exports.");
}
}
emitNodeWithoutSourceMap(node.name);
emitEnd(node.name);
@@ -49,7 +49,7 @@ m.x.toString();
//// [constDeclarations_access_1.js]
exports.x = 0;
x = 0;
//// [constDeclarations_access_2.js]
// Errors
m.x = 1;
@@ -9,7 +9,7 @@ import defaultBinding from "es6ImportDefaultBinding_0";
//// [es6ImportDefaultBinding_0.js]
exports.a = 10;
a = 10;
//// [es6ImportDefaultBinding_1.js]
@@ -16,9 +16,9 @@ import defaultBinding, { m, } from "es6ImportDefaultBindingFollowedWithNamedImp
//// [es6ImportDefaultBindingFollowedWithNamedImport_0.js]
exports.a = 10;
exports.x = exports.a;
exports.m = exports.a;
a = 10;
x = a;
m = a;
//// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
@@ -9,7 +9,7 @@ import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollo
var x: number = nameSpaceBinding.a;
//// [es6ImportDefaultBindingFollowedWithNamespaceBinding_0.js]
exports.a = 10;
a = 10;
//// [es6ImportDefaultBindingFollowedWithNamespaceBinding_1.js]
import defaultBinding, * as nameSpaceBinding from "es6ImportDefaultBindingFollowedWithNamespaceBinding_0";
var x = nameSpaceBinding.a;
@@ -9,7 +9,7 @@ import * as nameSpaceBinding from "es6ImportNameSpaceImport_0";
//// [es6ImportNameSpaceImport_0.js]
exports.a = 10;
a = 10;
//// [es6ImportNameSpaceImport_1.js]
@@ -20,11 +20,11 @@ import { a1 as a11, x1 as x11 } from "es6ImportNamedImport_0";
//// [es6ImportNamedImport_0.js]
exports.a = 10;
exports.x = exports.a;
exports.m = exports.a;
exports.a1 = 10;
exports.x1 = 10;
a = 10;
x = a;
m = a;
a1 = 10;
x1 = 10;
//// [es6ImportNamedImport_1.js]
@@ -13,9 +13,9 @@ import , { a } from "es6ImportNamedImportParsingError_0";
import { a }, from "es6ImportNamedImportParsingError_0";
//// [es6ImportNamedImportParsingError_0.js]
exports.a = 10;
exports.x = exports.a;
exports.m = exports.a;
a = 10;
x = a;
m = a;
//// [es6ImportNamedImportParsingError_1.js]
from;
"es6ImportNamedImportParsingError_0";
@@ -9,7 +9,7 @@ import "es6ImportWithoutFromClause_0";
//// [es6ImportWithoutFromClause_0.js]
exports.a = 10;
a = 10;
//// [es6ImportWithoutFromClause_1.js]
import "es6ImportWithoutFromClause_0";
+1 -1
View File
@@ -20,4 +20,4 @@ var A = (function () {
};
return A;
})();
exports.A = A;
A = A;
@@ -20,4 +20,4 @@ var A = (function () {
};
return A;
})();
exports.A = A;
A = A;
@@ -20,4 +20,4 @@ var A = (function () {
};
return A;
})();
exports.A = A;
A = A;