Merge pull request #1 from preprocess/develop

The great refactoring!

composer.json

@@ -1,20 +1,21 @@
 {
+    "type": "pre-macro",
     "name": "pre/short-closures",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.6"
-    },
-    "autoload": {
-        "files": [
-            "src/bootstrap.php"
-        ]
+        "pre/plugin": "^0.7"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0"
+        "phpunit/phpunit": "^5.0|^6.0"
     },
     "autoload-dev": {
         "psr-4": {
             "Pre\\ShortClosures\\": "tests"
         }
+    },
+    "extra": {
+        "macros": [
+            "src/macros.yay"
+        ]
     }
 }

phpunit.xml

@@ -9,7 +9,8 @@
     convertWarningsToExceptions="false"
     processIsolation="false"
     stopOnFailure="false"
-    syntaxCheck="false">
+    syntaxCheck="false"
+>
     <testsuites>
         <testsuite>
             <directory suffix="Test.php">tests</directory>

readme.md

@@ -1,9 +1,3 @@
 # Pre Short Closures
 
 Documentation can be found at [preprocess.io](https://preprocess.io/docs#short-closures).
-
-## Versioning
-
-This library follows [Semver](http://semver.org). According to Semver, you will be able to upgrade to any minor or patch version of this library without any breaking changes to the public API. Semver also requires that we clearly define the public API for this library.
-
-All methods, with `public` visibility, are part of the public API. All other methods are not part of the public API. Where possible, we'll try to keep `protected` methods backwards-compatible in minor/patch versions, but if you're overriding methods then please test your work before upgrading.

src/macros.yay

@@ -0,0 +1,94 @@
+<?php
+
+macro ·recursion {
+    ·chain(
+        ·token("("),
+        ·optional(
+            ·ls(
+                ·chain(
+                    ·optional(·ns())·argType,
+                    ·token(T_VARIABLE)·argName,
+                    ·optional(
+                        ·chain(
+                            ·token("="),
+                            ·either(
+                                ·ns(),
+                                ·token(T_CONSTANT_ENCAPSED_STRING),
+                                ·token(T_LNUMBER),
+                                ·token(T_DNUMBER),
+                                ·token(T_STRING)
+                            )
+                        )
+                    )·argAssignment
+                )·arg,
+                ·token(",")
+            )
+        )·args,
+        ·token(")"),
+        ·optional(
+            ·chain(
+                ·token(":"),
+                ·ns()
+            )
+        )·returnType,
+        ·token(T_DOUBLE_ARROW),
+        ·token("{"),
+        ·layer()·body,
+        ·token("}"),
+        ·_()·scope,
+        ·_()·simple
+    )
+} >> function($ast) {
+    $defined = [];
+
+    foreach ($ast->{"·args"} as $node) {
+        $name = (string) $node["·arg"]["·argName"];
+        $defined[$name] = true;
+    }
+
+    $bound = false;
+    $scope = new \Yay\Ast("·scope");
+
+    $pushed = [];
+
+    foreach ($ast->{"·body"} as $token) {
+        $name = $token->value();
+
+        if (!$token->is(T_VARIABLE)) {
+            continue;
+        }
+
+        if (isset($defined[$name]) || isset($pushed[$name])) {
+            continue;
+        }
+
+        if (substr($name, 1) === "this") {
+            continue;
+        }
+
+        $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);
+    }
+} >> {··trim(
+    ·scope ?·{
+        [·scope ···(, ) { ·var = ·var ?? null}, "fn" => function (·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignment } }) use (·scope ···(, ) { &·var }) ·returnType {
+            ·body
+        }]["fn"]
+    }
+
+    ·simple ?·{
+        function (·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignment } }) ·returnType {
+            ·body
+        }
+    }
+)}

tests/SpecTest.php

@@ -2,7 +2,7 @@
 
 namespace Pre\ShortClosures;
 
-use Pre\Testing\Runner;
+use Pre\Plugin\Testing\Runner;
 
 class SpecTest extends Runner
 {

tests/bootstrap.php

@@ -2,13 +2,12 @@
 
 namespace Yay;
 
-// let's use a namespace trick, to make non-colliding variables predictable.
-
-function md5($value)
-{
+function md5($value) {
     return $value;
 }
 
-putenv("PRE_BASE_DIR=" . __DIR__ . "/..");
-
 require __DIR__ . "/../vendor/autoload.php";
+
+putenv("PRE_BASE_DIR=" . __DIR__ . "/../");
+
+\Pre\Plugin\addMacroPath(__DIR__ . "/../src/macros.yay");

tests/specs/recursion.spec

@@ -12,21 +12,34 @@ $cb = () => {
     };
 };
 
+$foo = "hello";
+$bar = "world";
+
+$cb = () => {
+    return () => {
+        return () => {
+            print $foo . $bar;
+        };
+    };
+};
+
 --EXPECT--
 
-$cb = call_user_func(function ($context·0) {
-    return function () use ($context·0) {
-        extract($context·0);
-        return call_user_func(function ($context·1) {
-            return function () use ($context·1) {
-                extract($context·1);
-                return call_user_func(function ($context·2) {
-                    return function () use ($context·2) {
-                        extract($context·2);
-                        return "hello world";
-                    };
-                }, get_defined_vars());
-            };
-        }, get_defined_vars());
+$cb = function () {
+    return function () {
+        return function () {
+            return "hello world";
+        };
     };
-}, get_defined_vars());
+};
+
+$foo = "hello";
+$bar = "world";
+
+$cb = [$foo = $foo ?? null, $bar = $bar ?? null, "fn" => function () use (&$foo, &$bar) {
+    return [$foo = $foo ?? null, $bar = $bar ?? null, "fn" => function () use (&$foo, &$bar) {
+        return [$foo = $foo ?? null, $bar = $bar ?? null, "fn" => function () use (&$foo, &$bar) {
+            print $foo . $bar;
+        }]["fn"];
+    }]["fn"];
+}]["fn"];

tests/specs/short-closures.spec

@@ -6,9 +6,10 @@ Test short closure macros
 
 class Fixture
 {
-    public function foo($end) {
+    public function foo($end, $thing) {
         return ($name) => {
-            return "hello {$name}{$end}";
+            $this->something();
+            return "hello {$name}{$end}{$thing}";
         };
     }
 }
@@ -17,13 +18,11 @@ class Fixture
 
 class Fixture
 {
-    public function foo($end)
+    public function foo($end, $thing)
     {
-        return call_user_func(function ($context·0) {
-            return function ($name) use ($context·0) {
-                extract($context·0);
-                return "hello {$name}{$end}";
-            };
-        }, get_defined_vars());
+        return [$end = $end ?? null, $thing = $thing ?? null, "fn" => function ($name) use (&$end, &$thing) {
+            $this->something();
+            return "hello {$name}{$end}{$thing}";
+        }]["fn"];
     }
 }