parse refactoring

Author: guybedford

lib/system.js

@@ -16,7 +16,7 @@
 
     var isBrowser = typeof window != 'undefined';
     var Loader = global.Reflect && global.Reflect.Loader || require('./loader');
-    var Promise = global.Promise || require('es6-promise').Promise;
+    var Promise = global.Promise || require('when/es6-shim/Promise');
 
     // Helpers
     // Absolute URL parsing, from https://gist.github.com/Yaffle/1088850
@@ -266,6 +266,14 @@
 
     System.traceurOptions = {modules: 'instantiate'};
 
+    function checkForErrors(output, load) {
+      if (output.errors.length) {
+        for (var i = 0, l = output.errors.length; i < l; i++)
+          console.error(output.errors[i]);
+        throw new Error('Parse of ' + load.name + ', ' + load.address + ' failed, ' + output.errors.length);
+      }
+    }
+
     // parse function is used to parse a load record
     // Returns an array of ModuleSpecifiers
     System.parse = function(load) {
@@ -280,45 +288,29 @@
 
       console.assert(load.source, 'Non-empty source');
 
-      function checkForErrors(output) {
-        if (output.errors.length) {
-          output.errors.map(function(error) {
-            console.error(error);
-          });
-          throw new Error('Parse failed, ' + output.errors.length);
-        }
-      }
-
       var depsList;
-      (function () {
-        try {
-          load.kind = 'declarative';
 
-          var compiler = new traceur.Compiler();
-          var options = System.traceurOptions || {};
-          var output = compiler.stringToTree({content: load.source, options: options});
-          checkForErrors(output);
+      load.kind = 'declarative';
 
-          depsList = getImports(output.tree);
-          output = compiler.treeToTree(output);
-          checkForErrors(output);
+      var compiler = new traceur.Compiler();
+      var options = System.traceurOptions || {};
+      var output = compiler.stringToTree({content: load.source, options: options});
+      checkForErrors(output);
 
-          output = compiler.treeToString(output);
-          checkForErrors(output);
-          var source = output.js;
-          var sourceMap = output.generatedSourceMap;
+      depsList = getImports(output.tree);
+      output = compiler.treeToTree(output);
+      checkForErrors(output);
 
-          if (global.btoa && sourceMap)
-            source += '\n//# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(sourceMap))) + '\n';
+      output = compiler.treeToString(output);
+      checkForErrors(output);
+      var source = output.js;
+      var sourceMap = output.generatedSourceMap;
+
+      if (global.btoa && sourceMap)
+        source += '\n//# sourceMappingURL=data:application/json;base64,' + btoa(unescape(encodeURIComponent(sourceMap))) + '\n';
+
+      __eval(source, global, load);
 
-          __eval(source, global, load);
-        }
-        catch(e) {
-          if (e.name == 'SyntaxError' || e.name == 'TypeError')
-            e.message = 'Evaluating ' + (load.name || load.address) + '\n\t' + e.message;
-          throw e;
-        }
-      }());
       return depsList;
     }
 
@@ -384,7 +376,14 @@
       // store the registered declaration as load.declare
       load.declare = typeof name == 'string' ? declare : deps;
     }
-    eval('var __moduleName = "' + (load.name || '').replace('"', '\"') + '"; (function() { ' + __source + ' \n }).call(__global);');
+    try {
+      eval('var __moduleName = "' + (load.name || '').replace('"', '\"') + '"; (function() { ' + __source + ' \n }).call(__global);');
+    }
+    catch(e) {
+      if (e.name == 'SyntaxError' || e.name == 'TypeError')
+        e.message = 'Evaluating ' + (load.name || load.address) + '\n\t' + e.message;
+      throw e;
+    }
 
     System.register = System.__curRegister;
     delete System.__curRegister;