remove setter conditionals, adjust tests

Author: guybedford

lib/loader.js

@@ -691,13 +691,8 @@ function logloads(loads) {
 
         for (var i = 0, l = module.importers.length; i < l; i++) {
           var importerModule = module.importers[i];
-          if (importerModule.setters) {
-            var importerIndex = importerModule.dependencies.indexOf(module);
-            if (importerIndex != -1) {
-              var setter = importerModule.setters[importerIndex];
-              setter(moduleObj);
-            }
-          }
+          var importerIndex = importerModule.dependencies.indexOf(module);
+          importerModule.setters[importerIndex](moduleObj);
         }
         return value;
       });
@@ -712,8 +707,6 @@ function logloads(loads) {
         var depName = load.dependencies[i].value;
         var depModule = getOrCreateModuleRecord(depName);
 
-        depModule.importers.push(module);
-
         // if not already a module in the registry, try and link it now
         if (!loader.modules[depName]) {
 
@@ -731,6 +724,7 @@ function logloads(loads) {
         console.assert(depModule, 'Dependency module not found!');
 
         module.dependencies.push(depModule);
+        depModule.importers.push(module);
 
         // run the setter for this dependency
         if (module.setters[i])

test/syntax/circular2.js

@@ -2,6 +2,8 @@ import {fn1, variable1} from './circular1';
 
 export var variable2 = 'test circular 2';
 
+export { output as output1 } from './circular1';
+
 fn1();
 
 export var output;

test/syntax/even.js

@@ -5,4 +5,6 @@ export var counter = 0;
 export function even(n) {
   counter++;
   return n == 0 || odd(n - 1);
-}
+}
+
+odd(1);

test/test.js

@@ -211,7 +211,8 @@ function runTests() {
       System['import']('syntax/circular2').then(function(m2) {
         assert(
           [m2.output, 'test circular 1'],
-          [m1.output, 'test circular 2']
+          [m1.output, 'test circular 2'],
+          [m2.output1, 'test circular 2']
         );
       }, err);
     }, err);
@@ -221,9 +222,9 @@ function runTests() {
     System['import']('syntax/even').then(function(m) {
       assert(
         [m.even(10), true],
-        [m.counter, 6],
+        [m.counter, 7],
         [m.even(15), false],
-        [m.counter, 14]
+        [m.counter, 15]
       );
     }, err);
   });