Skip to content
This repository was archived by the owner on Jul 13, 2020. It is now read-only.

Commit de2a2f7

Browse files
guybedfordguybedford
committed
remove invariant checks
1 parent 987119f commit de2a2f7

5 files changed

Lines changed: 163 additions & 38 deletions

File tree

‎dist/es6-module-loader-sans-promises.js‎

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,67 @@ function logloads(loads) {
5151
return log;
5252
} */
5353

54+
55+
/* function checkInvariants() {
56+
// see https://bugs.ecmascript.org/show_bug.cgi?id=2603#c1
57+
58+
var loads = System._loader.loads;
59+
var linkSets = [];
60+
61+
for (var i = 0; i < loads.length; i++) {
62+
var load = loads[i];
63+
console.assert(load.status == 'loading' || load.status == 'loaded', 'Each load is loading or loaded');
64+
65+
for (var j = 0; j < load.linkSets.length; j++) {
66+
var linkSet = load.linkSets[j];
67+
68+
for (var k = 0; k < linkSet.loads.length; k++)
69+
console.assert(loads.indexOf(linkSet.loads[k]) != -1, 'linkSet loads are a subset of loader loads');
70+
71+
if (linkSets.indexOf(linkSet) == -1)
72+
linkSets.push(linkSet);
73+
}
74+
}
75+
76+
for (var i = 0; i < loads.length; i++) {
77+
var load = loads[i];
78+
for (var j = 0; j < linkSets.length; j++) {
79+
var linkSet = linkSets[j];
80+
81+
if (linkSet.loads.indexOf(load) != -1)
82+
console.assert(load.linkSets.indexOf(linkSet) != -1, 'linkSet contains load -> load contains linkSet');
83+
84+
if (load.linkSets.indexOf(linkSet) != -1)
85+
console.assert(linkSet.loads.indexOf(load) != -1, 'load contains linkSet -> linkSet contains load');
86+
}
87+
}
88+
89+
for (var i = 0; i < linkSets.length; i++) {
90+
var linkSet = linkSets[i];
91+
for (var j = 0; j < linkSet.loads.length; j++) {
92+
var load = linkSet.loads[j];
93+
94+
for (var k = 0; k < load.dependencies.length; k++) {
95+
var depName = load.dependencies[k].value;
96+
var depLoad;
97+
for (var l = 0; l < loads.length; l++) {
98+
if (loads[l].name != depName)
99+
continue;
100+
depLoad = loads[l];
101+
break;
102+
}
103+
104+
// loading records are allowed not to have their dependencies yet
105+
// if (load.status != 'loading')
106+
// console.assert(depLoad, 'depLoad found');
107+
108+
// console.assert(linkSet.loads.indexOf(depLoad) != -1, 'linkset contains all dependencies');
109+
}
110+
}
111+
}
112+
} */
113+
114+
54115
(function (__global) {
55116
(function() {
56117
var Promise = __global.Promise || require('es6-promise').Promise;
@@ -151,9 +212,7 @@ function logloads(loads) {
151212
load = createLoad(name);
152213
loader.loads.push(load);
153214

154-
setTimeout(function() {
155-
proceedToLocate(loader, load);
156-
}, 7);
215+
proceedToLocate(loader, load);
157216

158217
return load;
159218
});
@@ -176,7 +235,7 @@ function logloads(loads) {
176235
p
177236
// 15.2.4.4.1 CallFetch
178237
.then(function(address) {
179-
if (load.linkSets.length == 0)
238+
if (load.status != 'loading')
180239
return;
181240
load.address = address;
182241

@@ -190,22 +249,22 @@ function logloads(loads) {
190249
p
191250
// 15.2.4.5.1 CallTranslate
192251
.then(function(source) {
193-
if (load.linkSets.length == 0)
252+
if (load.status != 'loading')
194253
return;
195254
return loader.loaderObj.translate({ name: load.name, metadata: load.metadata, address: load.address, source: source });
196255
})
197256

198257
// 15.2.4.5.2 CallInstantiate
199258
.then(function(source) {
200-
if (load.linkSets.length == 0)
259+
if (load.status != 'loading')
201260
return;
202261
load.source = source;
203262
return loader.loaderObj.instantiate({ name: load.name, metadata: load.metadata, address: load.address, source: source });
204263
})
205264

206265
// 15.2.4.5.3 InstantiateSucceeded
207266
.then(function(instantiateResult) {
208-
if (load.linkSets.length == 0)
267+
if (load.status != 'loading')
209268
return;
210269

211270
var depsList;
@@ -225,6 +284,9 @@ function logloads(loads) {
225284
load.kind = 'declarative';
226285
depsList = getImports(body);
227286

287+
var oldSourceMaps = traceur.options.sourceMaps;
288+
var oldModules = traceur.options.modules;
289+
228290
traceur.options.sourceMaps = true;
229291
traceur.options.modules = 'instantiate';
230292

@@ -266,10 +328,16 @@ function logloads(loads) {
266328
System.register = curRegister;
267329
if (curSystem)
268330
__global.System = curSystem;
331+
if (oldSourceMaps)
332+
traceur.options.sourceMaps = oldSourceMaps;
333+
if (oldModules)
334+
traceur.options.modules = oldModules;
269335
throw e;
270336
}
271337
System.register = curRegister;
272338
__global.System = curSystem;
339+
traceur.options.sourceMaps = oldSourceMaps;
340+
traceur.options.modules = oldModules;
273341
}
274342
else if (typeof instantiateResult == 'object') {
275343
depsList = instantiateResult.deps || [];
@@ -281,7 +349,7 @@ function logloads(loads) {
281349

282350
// 15.2.4.6 ProcessLoadDependencies
283351
load.dependencies = [];
284-
load.depsList = depsList
352+
load.depsList = depsList;
285353
var loadPromises = [];
286354
for (var i = 0, l = depsList.length; i < l; i++) (function(request) {
287355
loadPromises.push(
@@ -743,7 +811,7 @@ function logloads(loads) {
743811

744812
defineProperty(this, 'global', {
745813
get: function() {
746-
return global;
814+
return __global;
747815
}
748816
});
749817
defineProperty(this, 'realm', {
@@ -1169,7 +1237,8 @@ function logloads(loads) {
11691237
if (global.System && global.traceur)
11701238
global.traceurSystem = global.System;
11711239

1172-
global.System = System;
1240+
if (isBrowser)
1241+
global.System = System;
11731242

11741243
// <script type="module"> support
11751244
// allow a data-init function callback once loaded

‎dist/es6-module-loader-sans-promises.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/es6-module-loader.js‎

Lines changed: 79 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -735,6 +735,67 @@ function logloads(loads) {
735735
return log;
736736
} */
737737

738+
739+
/* function checkInvariants() {
740+
// see https://bugs.ecmascript.org/show_bug.cgi?id=2603#c1
741+
742+
var loads = System._loader.loads;
743+
var linkSets = [];
744+
745+
for (var i = 0; i < loads.length; i++) {
746+
var load = loads[i];
747+
console.assert(load.status == 'loading' || load.status == 'loaded', 'Each load is loading or loaded');
748+
749+
for (var j = 0; j < load.linkSets.length; j++) {
750+
var linkSet = load.linkSets[j];
751+
752+
for (var k = 0; k < linkSet.loads.length; k++)
753+
console.assert(loads.indexOf(linkSet.loads[k]) != -1, 'linkSet loads are a subset of loader loads');
754+
755+
if (linkSets.indexOf(linkSet) == -1)
756+
linkSets.push(linkSet);
757+
}
758+
}
759+
760+
for (var i = 0; i < loads.length; i++) {
761+
var load = loads[i];
762+
for (var j = 0; j < linkSets.length; j++) {
763+
var linkSet = linkSets[j];
764+
765+
if (linkSet.loads.indexOf(load) != -1)
766+
console.assert(load.linkSets.indexOf(linkSet) != -1, 'linkSet contains load -> load contains linkSet');
767+
768+
if (load.linkSets.indexOf(linkSet) != -1)
769+
console.assert(linkSet.loads.indexOf(load) != -1, 'load contains linkSet -> linkSet contains load');
770+
}
771+
}
772+
773+
for (var i = 0; i < linkSets.length; i++) {
774+
var linkSet = linkSets[i];
775+
for (var j = 0; j < linkSet.loads.length; j++) {
776+
var load = linkSet.loads[j];
777+
778+
for (var k = 0; k < load.dependencies.length; k++) {
779+
var depName = load.dependencies[k].value;
780+
var depLoad;
781+
for (var l = 0; l < loads.length; l++) {
782+
if (loads[l].name != depName)
783+
continue;
784+
depLoad = loads[l];
785+
break;
786+
}
787+
788+
// loading records are allowed not to have their dependencies yet
789+
// if (load.status != 'loading')
790+
// console.assert(depLoad, 'depLoad found');
791+
792+
// console.assert(linkSet.loads.indexOf(depLoad) != -1, 'linkset contains all dependencies');
793+
}
794+
}
795+
}
796+
} */
797+
798+
738799
(function (__global) {
739800
(function() {
740801
var Promise = __global.Promise || require('es6-promise').Promise;
@@ -835,9 +896,7 @@ function logloads(loads) {
835896
load = createLoad(name);
836897
loader.loads.push(load);
837898

838-
setTimeout(function() {
839-
proceedToLocate(loader, load);
840-
}, 7);
899+
proceedToLocate(loader, load);
841900

842901
return load;
843902
});
@@ -860,7 +919,7 @@ function logloads(loads) {
860919
p
861920
// 15.2.4.4.1 CallFetch
862921
.then(function(address) {
863-
if (load.linkSets.length == 0)
922+
if (load.status != 'loading')
864923
return;
865924
load.address = address;
866925

@@ -874,22 +933,22 @@ function logloads(loads) {
874933
p
875934
// 15.2.4.5.1 CallTranslate
876935
.then(function(source) {
877-
if (load.linkSets.length == 0)
936+
if (load.status != 'loading')
878937
return;
879938
return loader.loaderObj.translate({ name: load.name, metadata: load.metadata, address: load.address, source: source });
880939
})
881940

882941
// 15.2.4.5.2 CallInstantiate
883942
.then(function(source) {
884-
if (load.linkSets.length == 0)
943+
if (load.status != 'loading')
885944
return;
886945
load.source = source;
887946
return loader.loaderObj.instantiate({ name: load.name, metadata: load.metadata, address: load.address, source: source });
888947
})
889948

890949
// 15.2.4.5.3 InstantiateSucceeded
891950
.then(function(instantiateResult) {
892-
if (load.linkSets.length == 0)
951+
if (load.status != 'loading')
893952
return;
894953

895954
var depsList;
@@ -909,6 +968,9 @@ function logloads(loads) {
909968
load.kind = 'declarative';
910969
depsList = getImports(body);
911970

971+
var oldSourceMaps = traceur.options.sourceMaps;
972+
var oldModules = traceur.options.modules;
973+
912974
traceur.options.sourceMaps = true;
913975
traceur.options.modules = 'instantiate';
914976

@@ -950,10 +1012,16 @@ function logloads(loads) {
9501012
System.register = curRegister;
9511013
if (curSystem)
9521014
__global.System = curSystem;
1015+
if (oldSourceMaps)
1016+
traceur.options.sourceMaps = oldSourceMaps;
1017+
if (oldModules)
1018+
traceur.options.modules = oldModules;
9531019
throw e;
9541020
}
9551021
System.register = curRegister;
9561022
__global.System = curSystem;
1023+
traceur.options.sourceMaps = oldSourceMaps;
1024+
traceur.options.modules = oldModules;
9571025
}
9581026
else if (typeof instantiateResult == 'object') {
9591027
depsList = instantiateResult.deps || [];
@@ -965,7 +1033,7 @@ function logloads(loads) {
9651033

9661034
// 15.2.4.6 ProcessLoadDependencies
9671035
load.dependencies = [];
968-
load.depsList = depsList
1036+
load.depsList = depsList;
9691037
var loadPromises = [];
9701038
for (var i = 0, l = depsList.length; i < l; i++) (function(request) {
9711039
loadPromises.push(
@@ -1427,7 +1495,7 @@ function logloads(loads) {
14271495

14281496
defineProperty(this, 'global', {
14291497
get: function() {
1430-
return global;
1498+
return __global;
14311499
}
14321500
});
14331501
defineProperty(this, 'realm', {
@@ -1853,7 +1921,8 @@ function logloads(loads) {
18531921
if (global.System && global.traceur)
18541922
global.traceurSystem = global.System;
18551923

1856-
global.System = System;
1924+
if (isBrowser)
1925+
global.System = System;
18571926

18581927
// <script type="module"> support
18591928
// allow a data-init function callback once loaded

0 commit comments

Comments
 (0)