prettify_cp2k: fix "=>" handling in variable decl, add tests

cp2k · Nov 4, 2020 · 310603e · 310603e
1 parent 60a01ae
commit 310603e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tools/prettify/prettify_cp2k/normalizeFortranFile.py b/tools/prettify/prettify_cp2k/normalizeFortranFile.py
@@ -46,7 +46,7 @@
     rf"""
 \s*(?P<var>{VALID_NAME})
 \s*(?P<rest>(:?\((?P<param>{NESTED_PAREN_1TO3_CONTENTS})\))?
-\s*(?:=\s*(?P<value>(?:
+\s*(?:(?P<assignment>=>?)\s*(?P<value>(?:
 {NOT_PUNC_COMMA}+|
 {BRAC_OPEN}(?:{NOT_PUNC}|{BRAC_OPEN}{NOT_PUNC}*{BRAC_CLOSE}|{QUOTED})*{BRAC_CLOSE}|
 {QUOTED})+))?)?
@@ -402,7 +402,7 @@ def parseRoutine(inFile, logger):
                     if m2.group("param"):
                         var += "(" + m2.group("param") + ")"
                     if m2.group("value"):
-                        var += " = "
+                        var += " {} ".format(m2["assignment"])
                         var += m2.group("value")
                     decl["vars"].append(var)
                     str = str[m2.span()[1] :]

diff --git a/tools/prettify/prettify_cp2k/selftest.py b/tools/prettify/prettify_cp2k/selftest.py
@@ -50,13 +50,14 @@
    USE example, ONLY: dp, test_routine, test_function, test_type, str_function
 
    IMPLICIT NONE
-   INTEGER :: r, i, j, k, l, my_integer, m
+   INTEGER :: r, i, j, k, l, my_integer, m, saved_var = 10
    INTEGER, DIMENSION(5) :: arr
    INTEGER, DIMENSION(20) :: big_arr
    INTEGER :: ENDIF
    TYPE(test_type) :: t
    REAL(KIND=dp) :: r1, r2, r3, r4, r5, r6
    INTEGER, POINTER :: point
+   INTEGER, POINTER :: point_init => NULL()
 
    point => NULL()