Refactored new tests, made semim optional

Author: assertchris

composer.json

@@ -3,7 +3,7 @@
     "license": "MIT",
     "require": {
         "php": "^7.0",
-        "pre/plugin": "^0.4.0"
+        "pre/plugin": "^0.5"
     },
     "autoload": {
         "files": [
@@ -14,7 +14,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7"
+        "phpunit/phpunit": "^5.0"
     },
     "autoload-dev": {
         "psr-4": {

src/macros.pre

@@ -5,15 +5,16 @@ macro ·recursion {
         defer,
         ·between(
             ·token("{"), ·layer()·body, ·token("}")
-        )
+        ),
+        ·optional(·token(";"))
     )
 } >> {
     $deferred = new \Pre\Deferred\Deferred(call_user_func(function($context) {
         return function() use ($context) {
             extract($context);
             ·body
         };
-    }, get_defined_vars()))
+    }, get_defined_vars()));
 }
 
 macro ·recursion {
@@ -22,7 +23,8 @@ macro ·recursion {
         ·ns()·function,
         ·between(
             ·token("("), ·layer()·parameters, ·token(")")
-        )
+        ),
+        ·token(";")
     )
 } >> {
     $deferred = new \Pre\Deferred\Deferred(call_user_func(function() {
@@ -31,5 +33,5 @@ macro ·recursion {
         return function() use ($context) {
             call_user_func_array(→(·function), $context);
         };
-    }, ·parameters))
+    }, ·parameters));
 }

tests/Fixture/.gitignore

@@ -0,0 +1,13 @@
+<?php
+
+namespace Pre\Deferred;
+
+use Pre\Testing\Runner;
+
+class SpecTest extends Runner
+{
+    protected function path(): string
+    {
+        return __DIR__ . "/specs";
+    }
+}

tests/Fixture/Fixture.pre

@@ -1,5 +1,14 @@
 <?php
 
+namespace Yay;
+
+// let's use a namespace trick, to make non-colliding variables predictable.
+
+function md5($value)
+{
+    return $value;
+}
+
 putenv("PRE_BASE_DIR=" . __DIR__ . "/..");
 
 require __DIR__ . "/../vendor/autoload.php";

tests/MacroTest.php

@@ -0,0 +1,30 @@
+--DESCRIPTION--
+
+Test deferred
+
+--GIVEN--
+
+defer unlink("path/to/file");
+
+defer {
+    fclose($handle);
+    print "all done";
+}
+
+--EXPECT--
+
+$deferred·0 = new \Pre\Deferred\Deferred(call_user_func(function () {
+    $context·0 = func_get_args();
+
+    return function () use ($context·0) {
+        call_user_func_array('unlink', $context·0);
+    };
+}, "path/to/file"));
+
+$deferred·2 = new \Pre\Deferred\Deferred(call_user_func(function ($context·2) {
+    return function () use ($context·2) {
+        extract($context·2);
+        fclose($handle);
+        print "all done";
+    };
+}, get_defined_vars()));