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

Baseline accept after merging

Browse Source
This commit is contained in:
Sheetal Nandi 2015-02-10 19:28:32 -08:00
parent 0332feda6a
commit 23c1c5e27c
13 changed files with 127 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js
View File

@ -27,16 +27,16 @@ exports.x = exports.a;
exports.m = exports.a;
//// [es6ImportDefaultBindingFollowedWithNamedImport_1.js]
var defaultBinding2 = require("es6ImportDefaultBindingFollowedWithNamedImport_0");
var x1 = a;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_1.a;
var defaultBinding3 = require("es6ImportDefaultBindingFollowedWithNamedImport_0");
var x1 = b;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_2.a;
var defaultBinding4 = require("es6ImportDefaultBindingFollowedWithNamedImport_0");
var x1 = x;
var x1 = y;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_3.x;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_3.a;
var defaultBinding5 = require("es6ImportDefaultBindingFollowedWithNamedImport_0");
var x1 = z;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_4.x;
var defaultBinding6 = require("es6ImportDefaultBindingFollowedWithNamedImport_0");
var x1 = m;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImport_0_5.m;
//// [es6ImportDefaultBindingFollowedWithNamedImport_0.d.ts]

12
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportDts.js
View File

@ -63,16 +63,16 @@ var x11 = (function () {
exports.x11 = x11;
//// [client.js]
var defaultBinding2 = require("server");
exports.x1 = new a();
exports.x1 = new _server_1.a();
var defaultBinding3 = require("server");
exports.x2 = new b();
exports.x2 = new _server_2.a11();
var defaultBinding4 = require("server");
exports.x4 = new x();
exports.x5 = new y();
exports.x4 = new _server_3.x();
exports.x5 = new _server_3.a12();
var defaultBinding5 = require("server");
exports.x3 = new z();
exports.x3 = new _server_4.x11();
var defaultBinding6 = require("server");
exports.x6 = new m();
exports.x6 = new _server_5.m();
//// [server.d.ts]

12
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js
View File

@ -27,16 +27,16 @@ exports.x = exports.a;
exports.m = exports.a;
//// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_1.js]
var defaultBinding2 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
var x1 = a;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_1.a;
var defaultBinding3 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
var x1 = b;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_2.a;
var defaultBinding4 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
var x1 = x;
var x1 = y;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.x;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_3.a;
var defaultBinding5 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
var x1 = z;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_4.x;
var defaultBinding6 = require("es6ImportDefaultBindingFollowedWithNamedImportInEs5_0");
var x1 = m;
var x1 = _es6ImportDefaultBindingFollowedWithNamedImportInEs5_0_5.m;
//// [es6ImportDefaultBindingFollowedWithNamedImportInEs5_0.d.ts]

12
tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js
View File

@ -29,12 +29,12 @@ define(["require", "exports"], function (require, exports) {
});
//// [client.js]
define(["require", "exports", "server", "server", "server", "server", "server"], function (require, exports, defaultBinding2, defaultBinding3, defaultBinding4, defaultBinding5, defaultBinding6) {
exports.x1 = a;
exports.x1 = b;
exports.x1 = x;
exports.x1 = y;
exports.x1 = z;
exports.x1 = m;
exports.x1 = _server_1.a;
exports.x1 = _server_2.a;
exports.x1 = _server_3.x;
exports.x1 = _server_3.a;
exports.x1 = _server_4.x;
exports.x1 = _server_5.m;
});

54
tests/baselines/reference/es6ImportNamedImport.js
View File

@ -51,39 +51,27 @@ exports.z1 = 10;
exports.z2 = 10;
exports.aaaa = 10;
//// [es6ImportNamedImport_1.js]
var _a = require("es6ImportNamedImport_0");
var a = _a.a;
var xxxx = a;
var _b = require("es6ImportNamedImport_0");
var b = _b.a;
var xxxx = b;
var _c = require("es6ImportNamedImport_0");
var x = _c.x;
var y = _c.a;
var xxxx = x;
var xxxx = y;
var _d = require("es6ImportNamedImport_0");
var z = _d.x;
var xxxx = z;
var _e = require("es6ImportNamedImport_0");
var m = _e.m;
var xxxx = m;
var _f = require("es6ImportNamedImport_0");
var a1 = _f.a1;
var x1 = _f.x1;
var xxxx = a1;
var xxxx = x1;
var _g = require("es6ImportNamedImport_0");
var a11 = _g.a1;
var x11 = _g.x1;
var xxxx = a11;
var xxxx = x11;
var _h = require("es6ImportNamedImport_0");
var z1 = _h.z1;
var z111 = z1;
var _j = require("es6ImportNamedImport_0");
var z3 = _j.z2;
var z2 = z3; // z2 shouldn't give redeclare error
var _es6ImportNamedImport_0_1 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_1.a;
var _es6ImportNamedImport_0_2 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_2.a;
var _es6ImportNamedImport_0_3 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_3.x;
var xxxx = _es6ImportNamedImport_0_3.a;
var _es6ImportNamedImport_0_4 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_4.x;
var _es6ImportNamedImport_0_5 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_5.m;
var _es6ImportNamedImport_0_6 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_6.a1;
var xxxx = _es6ImportNamedImport_0_6.x1;
var _es6ImportNamedImport_0_7 = require("es6ImportNamedImport_0");
var xxxx = _es6ImportNamedImport_0_7.a1;
var xxxx = _es6ImportNamedImport_0_7.x1;
var _es6ImportNamedImport_0_8 = require("es6ImportNamedImport_0");
var z111 = _es6ImportNamedImport_0_8.z1;
var _es6ImportNamedImport_0_9 = require("es6ImportNamedImport_0");
var z2 = _es6ImportNamedImport_0_9.z2; // z2 shouldn't give redeclare error
//// [es6ImportNamedImport_0.d.ts]

38
tests/baselines/reference/es6ImportNamedImportAmd.js
View File

@ -53,31 +53,19 @@ define(["require", "exports"], function (require, exports) {
exports.aaaa = 10;
});
//// [es6ImportNamedImportAmd_1.js]
define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, _a, _b, _c, _d, _e, _f, _g, _h, _j) {
var a = _a.a;
var xxxx = a;
var b = _b.a;
var xxxx = b;
var x = _c.x;
var y = _c.a;
var xxxx = x;
var xxxx = y;
var z = _d.x;
var xxxx = z;
var m = _e.m;
var xxxx = m;
var a1 = _f.a1;
var x1 = _f.x1;
var xxxx = a1;
var xxxx = x1;
var a11 = _g.a1;
var x11 = _g.x1;
var xxxx = a11;
var xxxx = x11;
var z1 = _h.z1;
var z111 = z1;
var z3 = _j.z2;
var z2 = z3; // z2 shouldn't give redeclare error
define(["require", "exports", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0", "es6ImportNamedImportAmd_0"], function (require, exports, _es6ImportNamedImportAmd_0_1, _es6ImportNamedImportAmd_0_2, _es6ImportNamedImportAmd_0_3, _es6ImportNamedImportAmd_0_4, _es6ImportNamedImportAmd_0_5, _es6ImportNamedImportAmd_0_6, _es6ImportNamedImportAmd_0_7, _es6ImportNamedImportAmd_0_8, _es6ImportNamedImportAmd_0_9) {
var xxxx = _es6ImportNamedImportAmd_0_1.a;
var xxxx = _es6ImportNamedImportAmd_0_2.a;
var xxxx = _es6ImportNamedImportAmd_0_3.x;
var xxxx = _es6ImportNamedImportAmd_0_3.a;
var xxxx = _es6ImportNamedImportAmd_0_4.x;
var xxxx = _es6ImportNamedImportAmd_0_5.m;
var xxxx = _es6ImportNamedImportAmd_0_6.a1;
var xxxx = _es6ImportNamedImportAmd_0_6.x1;
var xxxx = _es6ImportNamedImportAmd_0_7.a1;
var xxxx = _es6ImportNamedImportAmd_0_7.x1;
var z111 = _es6ImportNamedImportAmd_0_8.z1;
var z2 = _es6ImportNamedImportAmd_0_9.z2; // z2 shouldn't give redeclare error
});

54
tests/baselines/reference/es6ImportNamedImportDts.js
View File

@ -132,39 +132,27 @@ var aaaa1 = (function () {
})();
exports.aaaa1 = aaaa1;
//// [client.js]
var _a = require("server");
var a = _a.a;
exports.xxxx = new a();
var _b = require("server");
var b = _b.a11;
exports.xxxx1 = new b();
var _c = require("server");
var x = _c.x;
var y = _c.a12;
exports.xxxx2 = new x();
exports.xxxx3 = new y();
var _d = require("server");
var z = _d.x11;
exports.xxxx4 = new z();
var _e = require("server");
var m = _e.m;
exports.xxxx5 = new m();
var _f = require("server");
var a1 = _f.a1;
var x1 = _f.x1;
exports.xxxx6 = new a1();
exports.xxxx7 = new x1();
var _g = require("server");
var a11 = _g.a111;
var x11 = _g.x111;
exports.xxxx8 = new a11();
exports.xxxx9 = new x11();
var _h = require("server");
var z1 = _h.z1;
exports.z111 = new z1();
var _j = require("server");
var z3 = _j.z2;
exports.z2 = new z3(); // z2 shouldn't give redeclare error
var _server_1 = require("server");
exports.xxxx = new _server_1.a();
var _server_2 = require("server");
exports.xxxx1 = new _server_2.a11();
var _server_3 = require("server");
exports.xxxx2 = new _server_3.x();
exports.xxxx3 = new _server_3.a12();
var _server_4 = require("server");
exports.xxxx4 = new _server_4.x11();
var _server_5 = require("server");
exports.xxxx5 = new _server_5.m();
var _server_6 = require("server");
exports.xxxx6 = new _server_6.a1();
exports.xxxx7 = new _server_6.x1();
var _server_7 = require("server");
exports.xxxx8 = new _server_7.a111();
exports.xxxx9 = new _server_7.x111();
var _server_8 = require("server");
exports.z111 = new _server_8.z1();
var _server_9 = require("server");
exports.z2 = new _server_9.z2(); // z2 shouldn't give redeclare error
//// [server.d.ts]

54
tests/baselines/reference/es6ImportNamedImportInEs5.js
View File

@ -51,39 +51,27 @@ exports.z1 = 10;
exports.z2 = 10;
exports.aaaa = 10;
//// [es6ImportNamedImportInEs5_1.js]
var _a = require("es6ImportNamedImportInEs5_0");
var a = _a.a;
var xxxx = a;
var _b = require("es6ImportNamedImportInEs5_0");
var b = _b.a;
var xxxx = b;
var _c = require("es6ImportNamedImportInEs5_0");
var x = _c.x;
var y = _c.a;
var xxxx = x;
var xxxx = y;
var _d = require("es6ImportNamedImportInEs5_0");
var z = _d.x;
var xxxx = z;
var _e = require("es6ImportNamedImportInEs5_0");
var m = _e.m;
var xxxx = m;
var _f = require("es6ImportNamedImportInEs5_0");
var a1 = _f.a1;
var x1 = _f.x1;
var xxxx = a1;
var xxxx = x1;
var _g = require("es6ImportNamedImportInEs5_0");
var a11 = _g.a1;
var x11 = _g.x1;
var xxxx = a11;
var xxxx = x11;
var _h = require("es6ImportNamedImportInEs5_0");
var z1 = _h.z1;
var z111 = z1;
var _j = require("es6ImportNamedImportInEs5_0");
var z3 = _j.z2;
var z2 = z3; // z2 shouldn't give redeclare error
var _es6ImportNamedImportInEs5_0_1 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_1.a;
var _es6ImportNamedImportInEs5_0_2 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_2.a;
var _es6ImportNamedImportInEs5_0_3 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_3.x;
var xxxx = _es6ImportNamedImportInEs5_0_3.a;
var _es6ImportNamedImportInEs5_0_4 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_4.x;
var _es6ImportNamedImportInEs5_0_5 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_5.m;
var _es6ImportNamedImportInEs5_0_6 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_6.a1;
var xxxx = _es6ImportNamedImportInEs5_0_6.x1;
var _es6ImportNamedImportInEs5_0_7 = require("es6ImportNamedImportInEs5_0");
var xxxx = _es6ImportNamedImportInEs5_0_7.a1;
var xxxx = _es6ImportNamedImportInEs5_0_7.x1;
var _es6ImportNamedImportInEs5_0_8 = require("es6ImportNamedImportInEs5_0");
var z111 = _es6ImportNamedImportInEs5_0_8.z1;
var _es6ImportNamedImportInEs5_0_9 = require("es6ImportNamedImportInEs5_0");
var z2 = _es6ImportNamedImportInEs5_0_9.z2; // z2 shouldn't give redeclare error
//// [es6ImportNamedImportInEs5_0.d.ts]

3
tests/baselines/reference/es6ImportNamedImportInExportAssignment.js
View File

@ -11,8 +11,7 @@ export = a;
//// [es6ImportNamedImportInExportAssignment_0.js]
exports.a = 10;
//// [es6ImportNamedImportInExportAssignment_1.js]
var _a = require("es6ImportNamedImportInExportAssignment_0");
var a = _a.a;
var _es6ImportNamedImportInExportAssignment_0 = require("es6ImportNamedImportInExportAssignment_0");
module.exports = a;

5
tests/baselines/reference/es6ImportNamedImportInIndirectExportAssignment.js
View File

@ -23,9 +23,8 @@ var a;
a.c = c;
})(a = exports.a || (exports.a = {}));
//// [es6ImportNamedImportInIndirectExportAssignment_1.js]
var _a = require("es6ImportNamedImportInIndirectExportAssignment_0");
var a = _a.a;
var x = a;
var _es6ImportNamedImportInIndirectExportAssignment_0 = require("es6ImportNamedImportInIndirectExportAssignment_0");
var x = _es6ImportNamedImportInIndirectExportAssignment_0.a;
module.exports = x;

54
tests/baselines/reference/es6ImportNamedImportWithExport.js
View File

@ -50,39 +50,27 @@ exports.z1 = 10;
exports.z2 = 10;
exports.aaaa = 10;
//// [client.js]
var _a = require("server");
var a = _a.a;
exports.xxxx = a;
var _b = require("server");
var b = _b.a;
exports.xxxx = b;
var _c = require("server");
var x = _c.x;
var y = _c.a;
exports.xxxx = x;
exports.xxxx = y;
var _d = require("server");
var z = _d.x;
exports.xxxx = z;
var _e = require("server");
var m = _e.m;
exports.xxxx = m;
var _f = require("server");
var a1 = _f.a1;
var x1 = _f.x1;
exports.xxxx = a1;
exports.xxxx = x1;
var _g = require("server");
var a11 = _g.a1;
var x11 = _g.x1;
exports.xxxx = a11;
exports.xxxx = x11;
var _h = require("server");
var z1 = _h.z1;
exports.z111 = z1;
var _j = require("server");
var z3 = _j.z2;
exports.z2 = z3; // z2 shouldn't give redeclare error
var _server_1 = require("server");
exports.xxxx = _server_1.a;
var _server_2 = require("server");
exports.xxxx = _server_2.a;
var _server_3 = require("server");
exports.xxxx = _server_3.x;
exports.xxxx = _server_3.a;
var _server_4 = require("server");
exports.xxxx = _server_4.x;
var _server_5 = require("server");
exports.xxxx = _server_5.m;
var _server_6 = require("server");
exports.xxxx = _server_6.a1;
exports.xxxx = _server_6.x1;
var _server_7 = require("server");
exports.xxxx = _server_7.a1;
exports.xxxx = _server_7.x1;
var _server_8 = require("server");
exports.z111 = _server_8.z1;
var _server_9 = require("server");
exports.z2 = _server_9.z2; // z2 shouldn't give redeclare error
//// [server.d.ts]

5
tests/baselines/reference/es6ImportNamedImportWithTypesAndValues.js
View File

@ -36,9 +36,8 @@ var C2 = (function () {
})();
exports.C2 = C2;
//// [client.js]
var _a = require("server");
var C = _a.C; // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
exports.cVal = new C();
var _server = require("server"); // Shouldnt emit I and C2 into the js file and emit C and I in .d.ts file
exports.cVal = new _server.C();
//// [server.d.ts]

2
tests/baselines/reference/es6ImportWithoutFromClauseAmd.js
View File

@ -22,7 +22,7 @@ define(["require", "exports"], function (require, exports) {
exports.b = 10;
});
//// [es6ImportWithoutFromClauseAmd_2.js]
define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports, _c, _d) {
define(["require", "exports", "es6ImportWithoutFromClauseAmd_0", "es6ImportWithoutFromClauseAmd_2"], function (require, exports, , ) {
var _a = 10;
var _b = 10;
});