From e362512af36d02203a22c470569321cb16d43a24 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Sat, 11 Apr 2015 17:59:14 -0700
Subject: [PATCH] switch to my branch of regenerator - #1123, fixes #1015

---
 package.json                                  |  2 +-
 src/babel/patch.js                            | 10 +++---
 src/babel/polyfill.js                         |  2 +-
 .../transformers/other/regenerator.js         |  2 +-
 .../transformation/runtime/full/expected.js   | 29 ++++++++--------
 .../runtime/modules-system/expected.js        | 33 ++++++++++---------
 6 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 536dc501c1..9c73bf4073 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
     "output-file-sync": "^1.1.0",
     "path-is-absolute": "^1.0.0",
     "private": "^0.1.6",
-    "regenerator-babel": "0.8.13-2",
+    "regenerator": "https://github.com/sebmck/regenerator/archive/block-hoist.tar.gz",
     "regexpu": "^1.1.2",
     "repeating": "^1.1.2",
     "shebang-regex": "^1.0.0",
diff --git a/src/babel/patch.js b/src/babel/patch.js
index 209319fe3b..7bdd2f09a9 100644
--- a/src/babel/patch.js
+++ b/src/babel/patch.js
@@ -7,15 +7,15 @@ import * as t from "./types";
 
 extend(estraverse.VisitorKeys, t.VISITOR_KEYS);
 
-// regenerator-babel/ast-types
+// regenerator/ast-types
 
 var def = types.Type.def;
 var or  = types.Type.or;
 
-def("File")
-  .bases("Node")
-  .build("program")
-  .field("program", def("Program"));
+//def("File")
+//  .bases("Node")
+//  .build("program")
+//  .field("program", def("Program"));
 
 def("AssignmentPattern")
   .bases("Pattern")
diff --git a/src/babel/polyfill.js b/src/babel/polyfill.js
index a87ea8a8b5..e0f00ef5f9 100644
--- a/src/babel/polyfill.js
+++ b/src/babel/polyfill.js
@@ -4,4 +4,4 @@ if (global._babelPolyfill) {
 global._babelPolyfill = true;
 
 import "core-js/shim";
-import "regenerator-babel/runtime";
+import "regenerator/runtime";
diff --git a/src/babel/transformation/transformers/other/regenerator.js b/src/babel/transformation/transformers/other/regenerator.js
index 24df02bac3..1da96a156f 100644
--- a/src/babel/transformation/transformers/other/regenerator.js
+++ b/src/babel/transformation/transformers/other/regenerator.js
@@ -1,4 +1,4 @@
-import regenerator from "regenerator-babel";
+import regenerator from "regenerator";
 import * as t from "../../../types";
 
 export function check(node) {
diff --git a/test/core/fixtures/transformation/runtime/full/expected.js b/test/core/fixtures/transformation/runtime/full/expected.js
index 9be37be3ef..1febcf2d2d 100644
--- a/test/core/fixtures/transformation/runtime/full/expected.js
+++ b/test/core/fixtures/transformation/runtime/full/expected.js
@@ -10,21 +10,8 @@ _core.Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var giveWord = _regeneratorRuntime.mark(function giveWord() {
-  return _regeneratorRuntime.wrap(function giveWord$(context$1$0) {
-    while (1) switch (context$1$0.prev = context$1$0.next) {
-      case 0:
-        context$1$0.next = 2;
-        return myWord;
-
-      case 2:
-      case "end":
-        return context$1$0.stop();
-    }
-  }, giveWord, this);
-});
-
 exports.giveWord = giveWord;
+var marked0$0 = [giveWord].map(_regeneratorRuntime.mark);
 
 var _foo = require("someModule");
 
@@ -35,5 +22,19 @@ var bar = _interopRequireWildcard(_foo);
 var myWord = _core.Symbol("abc");
 exports.myWord = myWord;
 
+function giveWord() {
+  return _regeneratorRuntime.wrap(function giveWord$(context$1$0) {
+    while (1) switch (context$1$0.prev = context$1$0.next) {
+      case 0:
+        context$1$0.next = 2;
+        return myWord;
+
+      case 2:
+      case "end":
+        return context$1$0.stop();
+    }
+  }, marked0$0[0], this);
+}
+
 _foo2["default"];
 bar;
\ No newline at end of file
diff --git a/test/core/fixtures/transformation/runtime/modules-system/expected.js b/test/core/fixtures/transformation/runtime/modules-system/expected.js
index adcb2aaba3..0a7a69c79e 100644
--- a/test/core/fixtures/transformation/runtime/modules-system/expected.js
+++ b/test/core/fixtures/transformation/runtime/modules-system/expected.js
@@ -1,5 +1,19 @@
 System.register(["babel-runtime/helpers/to-consumable-array", "babel-runtime/regenerator"], function (_export) {
-  var _toConsumableArray, _regeneratorRuntime, generator;
+  var _toConsumableArray, _regeneratorRuntime, marked0$0;
+
+  function generator() {
+    return _regeneratorRuntime.wrap(function generator$(context$1$0) {
+      while (1) switch (context$1$0.prev = context$1$0.next) {
+        case 0:
+          context$1$0.next = 2;
+          return 1;
+
+        case 2:
+        case "end":
+          return context$1$0.stop();
+      }
+    }, marked0$0[0], this);
+  }
 
   return {
     setters: [function (_babelRuntimeHelpersToConsumableArray) {
@@ -10,23 +24,10 @@ System.register(["babel-runtime/helpers/to-consumable-array", "babel-runtime/reg
     execute: function () {
       "use strict";
 
-      generator = _regeneratorRuntime.mark(function generator() {
-        return _regeneratorRuntime.wrap(function generator$(context$1$0) {
-          while (1) switch (context$1$0.prev = context$1$0.next) {
-            case 0:
-              context$1$0.next = 2;
-              return 1;
-
-            case 2:
-            case "end":
-              return context$1$0.stop();
-          }
-        }, generator, this);
-      });
-
       _export("generator", generator);
 
+      marked0$0 = [generator].map(_regeneratorRuntime.mark);
       foo.apply(undefined, _toConsumableArray(bar));
     }
   };
-});
+});
\ No newline at end of file