Add support for square brackets and default parameter values

preprocess · Oct 12, 2018 · c72683a · c72683a
1 parent c63030a
commit c72683a
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 4 deletions.
diff --git a/source/macros.yay b/source/macros.yay
@@ -4,15 +4,21 @@ $(macro :recursion) {
     $(chain(
         buffer("class"),
         ns() as className,
-        buffer("<"),
+        either(
+            buffer("<"),
+            buffer("[")
+        ),
         ls(
             either(
                 token(T_ARRAY),
                 ns()
             ) as type,
             buffer(",")    
         ) as types,
-        buffer(">"),
+        either(
+            buffer(">"),
+            buffer("]")
+        ),
         buffer("{"),
         optional(
             repeat(
@@ -178,6 +184,8 @@ $(macro :recursion) {
                                     $(functionArgumentType)
                                 })
                                 $(functionArgumentName)
+                                $(functionArgumentEquals)
+                                $(functionArgumentValue)
                             }) })
                     ) $(functionReturn ... {
                         $(functionReturnTypeRemove ! {
@@ -231,15 +239,21 @@ $(macro :recursion) {
     $(chain(
         buffer("new"),
         ns() as className,
-        buffer("<"),
+        either(
+            buffer("<"),
+            buffer("[")
+        ),
         ls(
             either(
                 token(T_ARRAY),
                 ns()
             ) as type,
             token(",")    
         ) as types,
-        buffer(">"),
+        either(
+            buffer(">"),
+            buffer("]")
+        ),
         optional(
             chain(
                 buffer("("),

diff --git a/tests/GenericsTest.php b/tests/GenericsTest.php
@@ -46,4 +46,16 @@ public function test_can_handle_object_types()
         $greeter = process(__DIR__ . "/fixtures/can-handle-object-types.pre");
         $this->assertEquals("hello chris.", $greeter->greet(new Name("chris")));
     }
+
+    public function test_can_handle_square_brackets()
+    {
+        $greeter = process(__DIR__ . "/fixtures/can-handle-square-brackets.pre");
+        $this->assertEquals("hello chris.", $greeter->greet("chris"));
+    }
+
+    public function test_can_handle_default_parameter_values()
+    {
+        $greeter = process(__DIR__ . "/fixtures/can-handle-default-parameter-values.pre");
+        $this->assertEquals("hello chris.", $greeter->greet());
+    }
 }
diff --git a/tests/fixtures/can-handle-default-parameter-values.pre b/tests/fixtures/can-handle-default-parameter-values.pre
@@ -0,0 +1,11 @@
+<?php
+
+if (!class_exists('DefaultGreeter')) {
+    class DefaultGreeter<Z> {
+        public function greet(Z $name = "chris") {
+            return "hello {$name}.";
+        }
+    }
+}
+
+return new DefaultGreeter<string>;
diff --git a/tests/fixtures/can-handle-square-brackets.pre b/tests/fixtures/can-handle-square-brackets.pre
@@ -0,0 +1,11 @@
+<?php
+
+if (!class_exists('SquareGreeter')) {
+    class SquareGreeter[Z] {
+        public function greet(Z $name) {
+            return "hello {$name}.";
+        }
+    }
+}
+
+return new Greeter[string];