Changed how anonymous async functions work

Author: assertchris

src/macros.pre

@@ -1,11 +1,25 @@
 <?php
 
 macro ·recursion {
-    async
-    function
-    ·optional(·ns())·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());
+        };
+    }, get_defined_vars())
+}
+
+macro ·recursion {
+    async function ·ns()·function (···parameters) {···body}
 } >> {
     function ·function(···parameters) {
         return call_user_func(function($context) {

tests/specs/async.spec

@@ -30,15 +30,17 @@ function read($path)
     }, get_defined_vars());
 }
 
-$async = function ($path) {
-    return call_user_func(function ($context·1) {
-        $generator·1 = function () use ($context·1) {
-            extract($context·1);
-
-            $content = yield \Amp\File\get($path);
-            return $content;
-        };
+$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());
-    }, get_defined_vars());
-};
+    };
+}, get_defined_vars());