chore: adjust modifier pos

- gen pub -> pub gen
- async pub -> pub async

Author: Chronostasys

planglib/std/cols/arr.pi

@@ -52,7 +52,7 @@ impl <T> Array<T> {
         return;
     }
 
-    gen pub fn iter() Iterator<T> {
+    pub gen fn iter() Iterator<T> {
         for let i = 0; i < self.len as i64; i = i + 1 {
             yield return self.data[i];
         }

planglib/std/cols/hashtable.pi

@@ -42,7 +42,7 @@ impl <K:Hash+Eq<K>|V> HashTable<K|V>  {
         }
         return;
     }
-    gen pub fn into_iter() Iterator<(K,V)> {
+    pub gen fn into_iter() Iterator<(K,V)> {
         for let i = 0; i < arr_len(self.buckets); i = i + 1 {
             let node = self.buckets[i];
             while node is *TableNode<K|V> {

src/nomparser/function.rs

@@ -16,7 +16,7 @@ use super::*;
 #[test_parser(
     "
     /// this is a comment
-    gen pub fn f(  x: int, y  : int  ) int {
+    pub gen fn f(  x: int, y  : int  ) int {
         x = x+1;
         return 0;
     }
@@ -25,14 +25,14 @@ use super::*;
 #[test_parser(
     "
     /// this is a comment
-    async pub fn f(  x: int, y  : int  ) int {
+    pub async fn f(  x: int, y  : int  ) int {
         x = x+1;
         return 0;
     }
     "
 )]
 #[test_parser(
-    "gen pub fn f(  x: int, y  : int  ) int {
+    "pub gen fn f(  x: int, y  : int  ) int {
         x = x+1;
         return 0;
     }
@@ -79,11 +79,14 @@ pub fn function_def(input: Span) -> IResult<Span, Box<TopLevel>> {
     map_res(
         tuple((
             many0(del_newline_or_space!(comment)),
-            opt(alt((
-                tag_token_word(TokenType::GENERATOR_MARKER),
-                tag_token_word(TokenType::ASYNC_MARKER),
-            ))),
-            modifiable(tag_token_word(TokenType::FN), TokenType::PUB),
+            modifiable(
+                opt(alt((
+                    tag_token_word(TokenType::GENERATOR_MARKER),
+                    tag_token_word(TokenType::ASYNC_MARKER),
+                ))),
+                TokenType::PUB,
+            ),
+            tag_token_word(TokenType::FN),
             identifier,
             opt(generic_type_def),
             tag_token_symbol(TokenType::LPAREN),
@@ -109,8 +112,8 @@ pub fn function_def(input: Span) -> IResult<Span, Box<TopLevel>> {
         )),
         |(
             doc,
-            g,
-            (modifier, (_, start)),
+            (modifier, g),
+            (_, start),
             function_identifier,
             generics,
             _,

test/test/std_test.pi

@@ -107,7 +107,7 @@ pub fn test_std() void {
     return;
 }
 
-async pub fn test_nested_async_closure() Task<()> {
+pub async fn test_nested_async_closure() Task<()> {
     let a = 1;
     let f =async || => {
         let f =async || => {