Added static modifier

preprocess · Jun 30, 2017 · 359bcab · 359bcab
1 parent ae9ed12
commit 359bcab
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 13 deletions.
diff --git a/src/macros.yay b/src/macros.yay
@@ -10,12 +10,15 @@ macro {
     ·chain(
         async,
         ·optional(
-            ·either(
-                public,
-                protected,
-                private
+            ·repeat(
+                ·either(
+                    public,
+                    protected,
+                    private,
+                    static
+                )·modifier
             )
-        )·visibility,
+        )·modifiers,
         function,
         ·ns()·function,
         ·token("("),
@@ -52,19 +55,22 @@ macro {
         ·token(";")
     )
 } >> {··trim(
-    ·visibility function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise;
+    ··trim(·modifiers ···( ) { ·modifier }) function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise;
 )}
 
 macro ·recursion {
     ·chain(
         async,
         ·optional(
-            ·either(
-                public,
-                protected,
-                private
+            ·repeat(
+                ·either(
+                    public,
+                    protected,
+                    private,
+                    static
+                )·modifier
             )
-        )·visibility,
+        )·modifiers,
         function,
         ·ns()·function,
         ·token("("),
@@ -161,7 +167,7 @@ macro ·recursion {
     }
 } >> {··trim(
     ·scope ?·{
-        ·visibility function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
+        ··trim(·modifiers ···( ) { ·modifier }) function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
         {
             return call_user_func(PRE_ASYNC_WRAPPER, function () use (·scope ···(, ) { &·var }) {
                 ·body ·yields ?·{yield;}
@@ -170,7 +176,7 @@ macro ·recursion {
     }
 
     ·simple ?·{
-        ·visibility function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
+        ··trim(·modifiers ···( ) { ·modifier }) function ·function(·args ···(, ) { ·arg ··· { ·argType ·argName ·argAssignmentEq ·argAssignmentVal } }): \Amp\Promise
         {
             return call_user_func(PRE_ASYNC_WRAPPER, function () {
                 ·body ·yields ?·{yield;}

diff --git a/tests/specs/async.spec b/tests/specs/async.spec
@@ -20,6 +20,11 @@ class AsyncClass
     {
         return "boo!";
     }
+
+    async public static function complex()
+    {
+
+    }
 }
 
 $first = async function() {
@@ -58,6 +63,13 @@ class AsyncClass
             yield;
         });
     }
+
+    public static function complex(): \Amp\Promise
+    {
+        return call_user_func(PRE_ASYNC_WRAPPER, function () {
+            yield;
+        });
+    }
 }
 
 $first = function (): \Amp\Promise {