Fix load already loading #254

Author: guybedford

src/loader.js

@@ -174,7 +174,7 @@ function logloads(loads) {
         load = createLoad(name);
         load.status = 'linked';
         // https://bugs.ecmascript.org/show_bug.cgi?id=2795
-        // load.module = loader.modules[name];
+        load.module = loader.modules[name];
         return load;
       }
 
@@ -250,7 +250,7 @@ function logloads(loads) {
       if (instantiateResult === undefined) {
         load.address = load.address || '<Anonymous Module ' + ++anonCnt + '>';
 
-        // NB instead of load.kind, use load.isDeclarative
+        // instead of load.kind, use load.isDeclarative
         load.isDeclarative = true;
         // parse sets load.declare, load.depsList
         loader.loaderObj.parse(load);
@@ -342,12 +342,10 @@ function logloads(loads) {
       if (loader.modules[name])
         throw new TypeError('"' + name + '" already exists in the module table');
 
-      // NB this still seems wrong for LoadModule as we may load a dependency
-      // of another module directly before it has finished loading.
-      // see https://bugs.ecmascript.org/show_bug.cgi?id=2994
+      // adjusted to pick up existing loads
       for (var i = 0, l = loader.loads.length; i < l; i++)
         if (loader.loads[i].name == name)
-          throw new TypeError('"' + name + '" already loading');
+          return resolve(loader.loads[i].linkSets[0].done);
 
       var load = createLoad(name);