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

New sigil
preprocess · Sep 10, 2018 · ecd935a · ecd935a
2 parents 9da701d + ca568e8
commit ecd935a
Show file tree

Hide file tree

Showing 3 changed files with 86 additions and 70 deletions.
diff --git a/composer.json b/composer.json
@@ -3,12 +3,14 @@
     "name": "pre/parameter-loaders",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.10.0"
+        "pre/plugin": "^0.11.0"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
     "extra": {
-        "macros": ["source/macros.yay"]
+        "macros": [
+            "source/macros.yay"
+        ]
     }
 }
diff --git a/source/macros.yay b/source/macros.yay
@@ -1,21 +1,21 @@
 <?php
 
-macro {
-    ·chain(
+$(macro) {
+    $(chain(
         function,
-        ·optional(·token(T_STRING))·function,
-        ·between(
-            ·token("("),
-            ·optional(
-                ·ls(
-                    ·either(
-                        ·chain(
-                            ·optional(·ns())·enhanced_type,
-                            ·token(T_VARIABLE)·enhanced_name,
-                            ·token("="),
-                            ·chain(
-                                ·optional(·token(T_NEW))·enhanced_new,
-                                ·midrule(function($stream) {
+        optional(token(T_STRING) as function),
+        between(
+            token("("),
+            optional(
+                ls(
+                    either(
+                        chain(
+                            optional(ns() as enhancedType),
+                            token(T_VARIABLE) as enhancedName,
+                            token("="),
+                            chain(
+                                optional(token(T_NEW) as enhancedNew),
+                                midrule(function($stream) {
                                     $index = $stream->index();
 
                                     if (in_array(strtolower($stream->current()), ["true", "false", "null"])) {
@@ -24,58 +24,58 @@ macro {
 
                                     return new \Yay\Ast;
                                 }),
-                                ·ns()·enhanced_ns,
-                                ·optional(
-                                    ·chain(
-                                        ·token("("), ·layer(), ·token(")")
-                                    )
-                                )·enhanced_layer
-                            )·enhanced_value
-                        )·enhanced_parameter,
-                        ·chain(
-                            ·optional(·ns())·regular_type,
-                            ·token(T_VARIABLE)·regular_name,
-                            ·optional(
-                                ·chain(
-                                    ·token("="),
-                                    ·either(
-                                        ·token(T_CONSTANT_ENCAPSED_STRING),
-                                        ·token(T_LNUMBER),
-                                        ·token(T_DNUMBER),
-                                        ·token(T_STRING)
+                                ns() as enhancedNs,
+                                optional(
+                                    chain(
+                                        token("("), layer() as enhancedLayerValue, token(")")
                                     )
+                                ) as enhancedLayer
+                            ) as enhancedValue
+                        ) as enhancedParameter,
+                        chain(
+                            optional(ns() as regularType),
+                            token(T_VARIABLE) as regularName,
+                            optional(
+                                chain(
+                                    token("="),
+                                    either(
+                                        token(T_CONSTANT_ENCAPSED_STRING),
+                                        token(T_LNUMBER),
+                                        token(T_DNUMBER),
+                                        token(T_STRING)
+                                    ) as regularValue
                                 )
-                            )·regular_value
-                        )·regular_parameter
+                            ) as regularEq
+                        ) as regularParameter
                     ),
-                    ·token(",")
-                )·parameter
+                    token(",")
+                ) as parameter
             ),
-            ·token(")")
+            token(")")
         ),
-        ·optional(
-            ·chain(
-                ·token(":"),
-                ·ns()
+        optional(
+            chain(
+                token(":"),
+                ns()
             )
-        )·return_type,
-        ·between(
-            ·token("{"), ·layer()·rest, ·token("}")
+        ) as returnType,
+        between(
+            token("{"), layer() as rest, token("}")
         )
-    )
+    ))
 } >> {
-    function ·function(·parameter ··· (, ) { ·regular_parameter ?···{·regular_type ·regular_name ·regular_value} ·enhanced_parameter ?··· {·enhanced_type ·enhanced_name = null}}) ·return_type
+    function $(function)($(parameter ... (, ) { $(regularParameter ? ... { $(regularType) $(regularName) $(regularEq ... {= $(regularValue)}) }) $(enhancedParameter ? ... { $(enhancedType) $(enhancedName) = null }) })) $(returnType)
     {
-        ··collapse(··trim(
-            ·parameter ··· {
-                ·enhanced_parameter ?··· {
-                    if (is_null(·enhanced_name)) {
-                        ·enhanced_name = ·enhanced_value ··· {·enhanced_new ·enhanced_ns ·enhanced_layer};
-                    }
+        $(parameter ... {$$(trim(
+            $(enhancedParameter ? ... {
+                if (is_null($(enhancedName))) {
+                    $(enhancedName) = $(enhancedValue ... {$$(trim(
+                        $(enhancedNew) $$(trim( $(enhancedNs) $(enhancedLayer ... {($(enhancedLayerValue))}) ));
+                    ))})
                 }
-            }
-        ))
+            })
+        ))})
 
-        ·rest
+        $(rest)
     }
 }
diff --git a/tests/specs/parameter-loaders.spec b/tests/specs/parameter-loaders.spec
@@ -30,7 +30,7 @@ class Fixture
 
 class Fixture
 {
-    public function typeHintedRegular(string $string ="typeHintedRegular")
+    public function typeHintedRegular(string $string = "typeHintedRegular")
     {
         return "working";
     }
@@ -44,32 +44,30 @@ class Fixture
         return "working";
     }
 
-    public function multipleRegular($one ="one", $two =2.2, $three =true, $four =null)
+    public function multipleRegular($one = "one", $two = 2.2, $three = true, $four = null)
     {
         return "working";
     }
 
     public function multipleEnhanced($one = null, $two = null)
     {
         if (is_null($one)) {
-            $one =  ucwords("one");
+            $one = ucwords("one");
         }
-
         if (is_null($two)) {
-            $two =  round(2.2);
+            $two = round(2.2);
         }
 
         return "working";
     }
 
-    public function mixed($one, $two =2.2, $three = null, $four = null)
+    public function mixed($one, $two = 2.2, $three = null, $four = null)
     {
         if (is_null($three)) {
-            $three =  round(3.3);
+            $three = round(3.3);
         }
-
         if (is_null($four)) {
-            $four = new stdClass ;
+            $four = new stdClass;
         }
 
         return "working";
@@ -84,10 +82,26 @@ $anon = function($a = true, $b = "hello", $c = ucwords("world")) {
 
 ~~~
 
-$anon = function ($a =true, $b ="hello", $c = null) {
+$anon = function ($a = true, $b = "hello", $c = null) {
     if (is_null($c)) {
-        $c =  ucwords("world");
+        $c = ucwords("world");
     }
 
     print $b . " " . $c;
 };
+
+---
+
+$anon = function($driver = new Driver("hello world", 12)) {
+    return $driver->fn();
+};
+
+~~~
+
+$anon = function ($driver = null) {
+    if (is_null($driver)) {
+        $driver = new Driver("hello world", 12);
+    }
+
+    return $driver->fn();
+};