fixed #189

Sage · Dec 26, 2013 · 8abfe39 · 8abfe39
1 parent c34e5a8
commit 8abfe39
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/lib/callbacks/transform.js b/lib/callbacks/transform.js
@@ -847,22 +847,22 @@ if (typeof exports !== 'undefined') {
 	};
 
 	function _canonFlows(node, options) {
-		function _doIt(node, parent) {
+		function _doIt(node, parent, force) {
 			var scope = node._scope;
 
 			function _doAsyncFor(node) {
 				// extra pass to wrap async condition and update
 				if (node.condition && node.condition._async && node.condition.type !== CALL) node.condition = _flowsTemplates.CONDITION.generate(node, {
 					$name: "__$" + node._scope.name,
-					$condition: node.condition
+					$condition: _doIt(node.condition, node, true),
 				});
 				if (node.update && node.update._async) node.update = _flowsTemplates.UPDATE.generate(node, {
 					$name: "__$" + node._scope.name,
 					$update: _statementify(node.update)
 				});
 			}
 			if (node.type == FOR && node._pass === "flows") _doAsyncFor(node);
-			if (!scope || !scope.isAsync() || node._pass === "flows") return _propagate(node, _doIt);
+			if (!scope || !scope.isAsync() || (!force && node._pass === "flows")) return _propagate(node, _doIt);
 
 			switch (node.type) {
 			case IF:

diff --git a/test/common/eval-test._js b/test/common/eval-test._js
@@ -796,3 +796,17 @@ asyncTest("futures on _(fn, idx)", 1, function(_) {
 	start();
 });
 
+asyncTest("do while", 1, function(_) {
+	var i = 0;
+	function read(_) {
+		return delay(_, ++i); 
+	}
+	var s = "";
+	var v = read(_);
+	do {
+		s += v;
+	} while ((v = read(_)) < 5);
+	strictEqual(s, "1234");
+	start();
+});
+