Merge pull request #3 from preprocess/feature/new-sigil

New sigil

Author: assertchris

composer.json

@@ -3,7 +3,7 @@
     "name": "pre/deferred",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.10.0"
+        "pre/plugin": "^0.11.0"
     },
     "autoload": {
         "psr-4": {
@@ -14,9 +14,13 @@
         "phpunit/phpunit": "^5.0|^6.0"
     },
     "autoload-dev": {
-        "files": ["tests/stubs.php"]
+        "files": [
+            "tests/stubs.php"
+        ]
     },
     "extra": {
-        "macros": ["source/macros.yay"]
+        "macros": [
+            "source/macros.yay"
+        ]
     }
 }

source/Deferred.php

@@ -4,9 +4,6 @@
 
 final class Deferred
 {
-    /**
-     * @var callable
-     */
     private $deferred;
 
     public function __construct(callable $deferred)

source/macros.yay

@@ -1,22 +1,21 @@
 <?php
 
-macro ·recursion {
-    ·chain(
+$(macro :recursion) {
+    $(chain(
         defer,
-        ·between(
-            ·token("{"), ·layer()·body, ·token("}")
+        between(
+            token("{"), layer() as body, token("}")
         ),
-        ·optional(·token(";")),
-        ·_()·scope,
-        ·_()·simple
-    )
+        optional(token(";")),
+        _() as scope
+    ))
 } >> function($ast) {
     $bound = false;
-    $scope = new \Yay\Ast("·scope");
+    $scope = new \Yay\Ast("scope");
 
     $pushed = [];
 
-    foreach ($ast->{"·body"} as $token) {
+    foreach ($ast->{"body"} as $token) {
         $name = $token->value();
 
         if (!$token->is(T_VARIABLE)) {
@@ -31,48 +30,43 @@ macro ·recursion {
             continue;
         }
 
-        $scope->push(new \Yay\Ast("·var", $token));
+        $scope->push(new \Yay\Ast("var", $token));
         $pushed[$name] = true;
         $bound = true;
     }
 
     if ($bound) {
       $ast->append($scope);
-    } else {
-      $simple = new \Yay\Ast("·simple");
-      $simple->push(new \Yay\Ast());
-
-      $ast->append($simple);
     }
 } >> {
-    ··collapse(··trim(
-        ·scope ?·{
-            $deferred = new \Pre\Deferred\Deferred([·scope ···(, ) { ·var = ·var ?? null}, "fn" => function () use (··trim(·scope ···(, ) {&·var})) {
-                ··trim(·body)
+    $$(collapse($$(trim(
+        $(scope ? {
+            $deferred = new \Pre\Deferred\Deferred([$(scope ... (, ) {$$(trim($(var) = $(var) ?? null))}), "fn" => function () use ($(scope ... (, ) {&$(var)})) {
+                $$(trim($(body)))
             }]["fn"]);
-        }
+        })
 
-        ·simple ?·{
+        $(scope ! {
             $deferred = new \Pre\Deferred\Deferred(function () {
-                ··trim(·body)
+                $$(trim($(body)))
             });
-        }
-    ))
+        })
+    ))))
 }
 
-macro ·recursion {
-    ·chain(
+$(macro :recursion) {
+    $(chain(
         defer,
-        ·ns()·function,
-        ·between(
-            ·token("("), ·layer()·parameters, ·token(")")
+        ns() as function,
+        between(
+            token("("), layer() as parameters, token(")")
         ),
-        ·token(";")
-    )
+        token(";")
+    ))
 } >> {
-    $deferred = ··unsafe(new \Pre\Deferred\Deferred((function (...$parameters) {
+    $deferred = $$(unsafe(new \Pre\Deferred\Deferred((function (...$parameters) {
         return function () use ($parameters) {
-            ·function(...$parameters);
+            $(function)(...$parameters);
         };
-    })(·parameters)));
+    })($(parameters)))));
 }

tests/specs/deferred.spec

@@ -2,7 +2,7 @@ defer unlink("path/to/file");
 
 ~~~
 
-$deferred·0 = new \Pre\Deferred\Deferred((function (...$parameters) {
+$deferred___0 = new \Pre\Deferred\Deferred((function (...$parameters) {
     return function () use ($parameters) {
         unlink(...$parameters);
     };
@@ -17,7 +17,7 @@ defer {
 
 ~~~
 
-$deferred·0 = new \Pre\Deferred\Deferred([$handle = $handle ?? null, "fn" => function () use (&$handle) {
+$deferred___0 = new \Pre\Deferred\Deferred([$handle = $handle ?? null, "fn" => function () use (&$handle) {
     fclose($handle);
     print "all done";
 }]["fn"]);