Fix ModulePattern for functions with kind in their return type

loki/frontend/regex.py

@@ -386,8 +386,8 @@ def __init__(self):
             r'^module[ \t]+(?P<name>\w+)\b.*?$'
             r'(?P<spec>.*?)'
             r'(?P<contains>^contains\n(?:'
-            r'(?:[ \t\w()]*?subroutine.*?^end[ \t]*subroutine\b(?:[ \t]\w+)?\n)|'
-            r'(?:[ \t\w()]*?function.*?^end[ \t]*function\b(?:[ \t]\w+)?\n)|'
+            r'(?:[ \t\w()=]*?subroutine.*?^end[ \t]*subroutine\b(?:[ \t]\w+)?\n)|'
+            r'(?:[ \t\w()=]*?function.*?^end[ \t]*function\b(?:[ \t]\w+)?\n)|'
             r'(?:^#\w+.*?\n)'
             r')*)?'
             r'^end[ \t]*module\b(?:[ \t](?P=name))?',

tests/test_frontends.py

@@ -471,8 +471,9 @@ def test_regex_module_from_source():
     """
     fcode = """
 module some_module
-    implicit none
     use foobar
+    implicit none
+    integer, parameter :: k = selected_int_kind(5)
 contains
     subroutine module_routine
         integer m
@@ -481,9 +482,9 @@ def test_regex_module_from_source():
         call routine_b(m, 6)
     end subroutine module_routine
 
-    function module_function(n)
+    integer(kind=k) function module_function(n)
         integer n
-        n = 3
+        module_function = n + 2
     end function module_function
 end module some_module
     """.strip()