merge loader constructor, minor wrapper adjustments

Author: guybedford

src/loader.js

@@ -116,6 +116,7 @@ function logloads(loads) {
     }
     return -1;
   };
+  var defineProperty = $__Object$defineProperty;
 
   // 15.2.3 - Runtime Semantics: Loader State
 
@@ -1079,32 +1080,3 @@ function logloads(loads) {
 
 })();
 
-// Define our eval outside of the scope of any other reference defined in this
-// file to avoid adding those references to the evaluation scope.
-var __curRegister;
-function __eval(__source, __global, load) {
-  // Hijack System.register to set declare function
-  __curRegister = System.register;
-  System.register = function(name, deps, declare) {
-    if (typeof name != 'string') {
-      declare = deps;
-      deps = name;
-    }
-    // store the registered declaration as load.declare
-    // store the deps as load.deps
-    load.declare = declare;
-    load.depsList = deps;
-  }
-  try {
-    eval('(function() { var __moduleName = "' + (load.name || '').replace('"', '\"') + '"; ' + __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 = __curRegister;
-}
-
-

src/polyfill-wrapper-end.js

@@ -1,2 +1,29 @@
 
+// Define our eval outside of the scope of any other reference defined in this
+// file to avoid adding those references to the evaluation scope.
+function __eval(__source, __global, load) {
+  // Hijack System.register to set declare function
+  var __curRegister = System.register;
+  System.register = function(name, deps, declare) {
+    if (typeof name != 'string') {
+      declare = deps;
+      deps = name;
+    }
+    // store the registered declaration as load.declare
+    // store the deps as load.deps
+    load.declare = declare;
+    load.depsList = deps;
+  }
+  try {
+    eval('(function() { var __moduleName = "' + (load.name || '').replace('"', '\"') + '"; ' + __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 = __curRegister;
+}
+
 })(typeof global !== 'undefined' ? global : this);

src/polyfill-wrapper-start.js

@@ -1,36 +1,35 @@
 (function(__global) {
 
-  $__Object$getPrototypeOf = Object.getPrototypeOf || function(obj) {
-    return obj.__proto__;
-  };
+$__Object$getPrototypeOf = Object.getPrototypeOf || function(obj) {
+  return obj.__proto__;
+};
 
-  var defineProperty;
-  (function () {
-    try {
-      if (!!Object.defineProperty({}, 'a', {})) {
-        defineProperty = Object.defineProperty;
-      }
-    } catch (e) {
-      defineProperty = function (obj, prop, opt) {
-        try {
-          obj[prop] = opt.value || opt.get.call(obj);
-        }
-        catch(e) {}
+var $__Object$defineProperty;
+(function () {
+  try {
+    if (!!Object.defineProperty({}, 'a', {})) {
+      $__Object$defineProperty = Object.defineProperty;
+    }
+  } catch (e) {
+    $__Object$defineProperty = function (obj, prop, opt) {
+      try {
+        obj[prop] = opt.value || opt.get.call(obj);
       }
+      catch(e) {}
     }
-  }());
-  $__Object$defineProperty = defineProperty;
+  }
+}());
 
-  $__Object$create = Object.create || function(o, props) {
-    function F() {}
-    F.prototype = o;
+$__Object$create = Object.create || function(o, props) {
+  function F() {}
+  F.prototype = o;
 
-    if (typeof(props) === "object") {
-      for (prop in props) {
-        if (props.hasOwnProperty((prop))) {
-          F[prop] = props[prop];
-        }
+  if (typeof(props) === "object") {
+    for (prop in props) {
+      if (props.hasOwnProperty((prop))) {
+        F[prop] = props[prop];
       }
     }
-    return new F();
-  };
+  }
+  return new F();
+};