better control flow for tco continuation - fixes #850 and fixes #822

test/fixtures/transformation/es6-tail-call/call-apply/expected.js

@@ -4,7 +4,10 @@
   var _this = this,
       _arguments = arguments;
 
-  _function: while (true) {
+  var _again = true;
+
+  _function: while (_again) {
+    _again = false;
     var n = _x;
 
     if (n <= 0) {
@@ -14,10 +17,12 @@
 
     if (Math.random() > 0.5) {
       _arguments = [_x = n - 1];
+      _again = true;
       continue _function;
     } else {
       _arguments = [_x = n - 1];
+      _again = true;
       continue _function;
-    }return;
+    }
   }
 })(1000000) === "foo";

test/fixtures/transformation/es6-tail-call/expression-consequent/expected.js

@@ -1,10 +1,14 @@
 "use strict";
 
 function f() {
-  _function: while (true) {
+  var _again = true;
+
+  _function: while (_again) {
+    _again = false;
+
     if (true) {} else {
+      _again = true;
       continue _function;
     }
-    return;
   }
 }

test/fixtures/transformation/es6-tail-call/expressions/expected.js

@@ -3,7 +3,10 @@
 (function f(_x) {
   var _left;
 
-  _function: while (true) {
+  var _again = true;
+
+  _function: while (_again) {
+    _again = false;
     var n = _x;
     if (n <= 0) {
       return "foo";
@@ -19,7 +22,8 @@
       }
 
       _x = n - 1;
+      _again = true;
       continue _function;
-    }return;
+    }
   }
-})(1000000, true) === "foo";
+})(1000000, true) === "foo";

test/fixtures/transformation/es6-tail-call/factorial/expected.js

@@ -2,16 +2,19 @@
 
 function fact(_x2) {
   var _arguments = arguments;
+  var _again = true;
 
-  _function: while (true) {
+  _function: while (_again) {
+    _again = false;
     var n = _x2;
     acc = undefined;
     var acc = _arguments[1] === undefined ? 1 : _arguments[1];
     if (n > 1) {
       _arguments = [_x2 = n - 1, acc * n];
+      _again = true;
       continue _function;
     } else {
       return acc;
-    }return;
+    }
   }
-}
+}

test/fixtures/transformation/es6-tail-call/recursion/expected.js

@@ -2,10 +2,12 @@
 
 (function f(_x2) {
   var _arguments = arguments;
+  var _again = true;
 
-  _function: while (true) {
+  _function: while (_again) {
     var g = function g() {};
 
+    _again = false;
     var n = _x2;
     m = local1 = local2 = local3 = undefined;
     var m = _arguments[1] === undefined ? getDefaultValue() : _arguments[1];
@@ -21,7 +23,7 @@
     // `g` should be function here on each pass
     g = 123;
     _arguments = [_x2 = n - 1];
+    _again = true;
     continue _function;
-    return;
   }
-})(1000000, true) === "foo";
+})(1000000, true) === "foo";

test/fixtures/transformation/es6-tail-call/try-catch/expected.js

@@ -11,7 +11,10 @@
 })(1000000) === "foo";
 
 (function f(_x) {
-  _function: while (true) {
+  var _again = true;
+
+  _function: while (_again) {
+    _again = false;
     var n = _x;
 
     if (n <= 0) {
@@ -22,9 +25,9 @@
       throw new Error();
     } catch (e) {
       _x = n - 1;
+      _again = true;
       continue _function;
     }
-    return;
   }
 })(1000000) === "foo";
 
@@ -41,7 +44,10 @@
 })(1000000) === "foo";
 
 (function f(_x) {
-  _function: while (true) {
+  var _again = true;
+
+  _function: while (_again) {
+    _again = false;
     var n = _x;
 
     if (n <= 0) {
@@ -50,8 +56,8 @@
 
     try {} finally {
       _x = n - 1;
+      _again = true;
       continue _function;
     }
-    return;
   }
-})(1000000) === "foo";
+})(1000000) === "foo";