Using Amp\call

Author: assertchris

src/macros.pre

@@ -1,19 +1,19 @@
 <?php
 
 macro ·recursion {
-    async function(···parameters) {···body}
+    async function (···parameters) {···body}
 } >> {
-    call_user_func(function($outer) {
-        return function(···parameters) use ($outer) {
-            $generator = call_user_func(function($inner) use ($outer) {
-                return function() use ($outer, $inner) {
-                    extract($outer);
-                    extract($inner);
-                    ···body
-                };
-            }, get_defined_vars());
-
-            return new \Amp\Coroutine($generator());
+    call_user_func(function ($outer) {
+        return function (···parameters) use ($outer) {
+            return Amp\call(
+                call_user_func(function ($inner) use ($outer) {
+                    return function () use ($outer, $inner) {
+                        extract($outer);
+                        extract($inner);
+                        ···body
+                    };
+                }, get_defined_vars())
+            );
         };
     }, get_defined_vars())
 }
@@ -22,14 +22,12 @@ macro ·recursion {
     async function ·ns()·function (···parameters) {···body}
 } >> {
     function ·function(···parameters) {
-        return call_user_func(function($context) {
-            $generator = function() use ($context) {
+        return call_user_func(function ($context) {
+            return Amp\call(function () use ($context) {
                 extract($context);
 
                 ···body
-            };
-
-            return new \Amp\Coroutine($generator());
+            });
         }, get_defined_vars());
     }
 }

tests/specs/async.spec

@@ -19,28 +19,26 @@ $async = async function($path) {
 function read($path)
 {
     return call_user_func(function ($context·0) {
-        $generator·0 = function () use ($context·0) {
+        return Amp\call(function () use ($context·0) {
             extract($context·0);
 
             $content = yield \Amp\File\get($path);
             return $content;
-        };
-
-        return new \Amp\Coroutine($generator·0());
+        });
     }, get_defined_vars());
 }
 
 $async = call_user_func(function ($outer·1) {
     return function ($path) use ($outer·1) {
-        $generator·1 = call_user_func(function ($inner·1) use ($outer·1) {
-            return function () use ($outer·1, $inner·1) {
-                extract($outer·1);
-                extract($inner·1);
-                $content = yield \Amp\File\get($path);
-                return $content;
-            };
-        }, get_defined_vars());
-
-        return new \Amp\Coroutine($generator·1());
+        return Amp\call(
+                call_user_func(function ($inner·1) use ($outer·1) {
+                    return function () use ($outer·1, $inner·1) {
+                        extract($outer·1);
+                        extract($inner·1);
+                        $content = yield \Amp\File\get($path);
+                        return $content;
+                    };
+                }, get_defined_vars())
+            );
     };
 }, get_defined_vars());