Added better amp-specific generation

preprocess · Jun 30, 2017 · 35a02c5 · 35a02c5
1 parent b0dfd50
commit 35a02c5
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 34 deletions.
diff --git a/composer.json b/composer.json
@@ -5,11 +5,6 @@
     "require": {
         "pre/plugin": "^0.7.3"
     },
-    "autoload": {
-        "files": [
-            "src/constants.php"
-        ]
-    },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },

diff --git a/src/constants.php b/src/constants.php
diff --git a/src/macros.yay b/src/macros.yay
@@ -115,9 +115,21 @@ macro ·recursion {
         ·token("}"),
         ·_()·scope,
         ·_()·simple,
-        ·_()·yields
+        ·_()·yields,
+        ·_()·amp1,
+        ·_()·amp2
     )
 } >> function($ast) {
+    if (function_exists("\\Amp\\resolve")) {
+        $append = new \Yay\Ast("·amp1");
+        $append->push(new \Yay\Ast());
+        $ast->append($append);
+    } else {
+        $append = new \Yay\Ast("·amp2");
+        $append->push(new \Yay\Ast());
+        $ast->append($append);
+    }
+
     $defined = [];
     $yields = false;
 
@@ -175,18 +187,26 @@ macro ·recursion {
     ·scope ?·{
         ··trim(·modifiers ···( ) { ·modifier }) function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
         {
-            return call_user_func(PRE_ASYNC_WRAPPER, function () use (·scope ···(, ) { &·var }) {
-                ·body ·yields ?·{yield;}
-            });
+            return ··trim(
+                ·amp1 ?· { \Amp\resolve }
+                ·amp2 ?· { \Amp\call }
+                (function () use (·scope ···(, ) { &·var }) {
+                    ·body ·yields ?·{yield;}
+                });
+            )
         }
     }
 
     ·simple ?·{
         ··trim(·modifiers ···( ) { ·modifier }) function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
         {
-            return call_user_func(PRE_ASYNC_WRAPPER, function () {
-                ·body ·yields ?·{yield;}
-            });
+            return ··trim(
+                ·amp1 ?· { \Amp\resolve }
+                ·amp2 ?· { \Amp\call }
+                (function () {
+                    ·body ·yields ?·{yield;}
+                });
+            )
         }
     }
 )}
@@ -238,9 +258,21 @@ macro ·recursion {
         ·token("}"),
         ·_()·scope,
         ·_()·simple,
-        ·_()·yields
+        ·_()·yields,
+        ·_()·amp1,
+        ·_()·amp2
     )
 } >> function($ast) {
+    if (function_exists("\\Amp\\resolve")) {
+        $append = new \Yay\Ast("·amp1");
+        $append->push(new \Yay\Ast());
+        $ast->append($append);
+    } else {
+        $append = new \Yay\Ast("·amp2");
+        $append->push(new \Yay\Ast());
+        $ast->append($append);
+    }
+
     $defined = [];
     $yields = false;
 
@@ -297,17 +329,25 @@ macro ·recursion {
 } >> {··trim(
     ·scope ?·{
         [·scope ···(, ) { ·var = ·var ?? null}, "fn" => function (·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }) use (·scope ···(, ) { &·var }): \Amp\Promise {
-            return call_user_func(PRE_ASYNC_WRAPPER, function () use (·scope ···(, ) { &·var }) {
-                ·body ·yields ?·{yield;}
-            });
+            return ··trim(
+                ·amp1 ?· { \Amp\resolve }
+                ·amp2 ?· { \Amp\call }
+                (function () use (·scope ···(, ) { &·var }) {
+                    ·body ·yields ?·{yield;}
+                });
+            )
         }]["fn"]
     }
 
     ·simple ?·{
         function (·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignVal } }): \Amp\Promise {
-            return call_user_func(PRE_ASYNC_WRAPPER, function () {
-                ·body ·yields ?·{yield;}
-            });
+            return ··trim(
+                ·amp1 ?· { \Amp\resolve }
+                ·amp2 ?· { \Amp\call }
+                (function () {
+                    ·body ·yields ?·{yield;}
+                });
+            )
         }
     }
 )}
diff --git a/tests/specs/async.spec b/tests/specs/async.spec
@@ -51,42 +51,42 @@ class AsyncClass
 {
     public function first(array $data = []): \Amp\Promise
     {
-        return call_user_func(PRE_ASYNC_WRAPPER, function () {
+        return \Amp\call(function () {
             yield \Amp\File\get("path/to/file");
         });
     }
 
     public function second(): \Amp\Promise
     {
-        return call_user_func(PRE_ASYNC_WRAPPER, function () {
+        return \Amp\call(function () {
             return "boo!";
             yield;
         });
     }
 
     public static function complex(): \Amp\Promise
     {
-        return call_user_func(PRE_ASYNC_WRAPPER, function () {
+        return \Amp\call(function () {
             yield;
         });
     }
 }
 
 $first = function (): \Amp\Promise {
-    return call_user_func(PRE_ASYNC_WRAPPER, function () {
+    return \Amp\call(function () {
         yield "here";
     });
 };
 
 $second = [$thing = $thing ?? null, "fn" => function () use (&$thing): \Amp\Promise {
-    return call_user_func(PRE_ASYNC_WRAPPER, function () use (&$thing) {
+    return \Amp\call(function () use (&$thing) {
         $this->something();
         yield $thing;
     });
 }]["fn"];
 
 $third = [$thing = $thing ?? null, "fn" => function () use (&$thing): \Amp\Promise {
-    return call_user_func(PRE_ASYNC_WRAPPER, function () use (&$thing) {
+    return \Amp\call(function () use (&$thing) {
         yield $thing;
     });
 }]["fn"];