fypp: fix nested fypp / Fortran scopes

This ensures globally consistent indentation

Author: pseewald

fortran_tests/after/test_fypp.f90

@@ -316,14 +316,30 @@ end function maxRelError_${RANK}$_${PREC}$
             #:endfor
          #:endfor
 
-         end module errorcalc
+      end module errorcalc
 
 ! tests for fypp directives inside Fortran continuation lines
-         call test(arg1, &
-                   ${a if a  > b else b}$, arg3, &
+      call test(arg1, &
+                ${a if a  > b else b}$, arg3, &
  #:if c>d
-                   c, &
+                c, &
  #:else
-                   d, &
+                d, &
  #:endif
-                   arg4)
+                arg4)
+
+! test for nested fypp / fortran constructs
+! this is globally consistent even though the logical scopes can not be matched correctly
+
+      #:if do
+         do x = 1, 3
+            ax = x*0.1
+         #:else
+            ax = 0.1
+         #:endif
+         r = ax
+         #:if do
+         end do
+      #:endif
+
+      r2 = r**2

fortran_tests/before/test_fypp.f90

@@ -330,3 +330,19 @@ end module errorcalc
    d,&
  #:endif
    arg4)
+
+! test for nested fypp / fortran constructs
+! this is globally consistent even though the logical scopes can not be matched correctly
+
+#:if do
+   do x=1,3
+      ax=x*0.1
+#:else
+   ax=0.1
+#:endif
+   r=ax
+#:if do
+   enddo
+#:endif
+
+r2 = r**2

fortran_tests/test_results/expected_results

@@ -2025,7 +2025,7 @@ cp2k/src/spglib_f08.F : db2758c990ccb023e2c7c3567d003a0b74f167096af95c75b628c270
 cp2k/src/subsys/molecule_kind_list_types.F : b32df6ecf4df8a48925c87b3fbdf6758814de5ed10051e9ea19199799961af46
 cp2k/src/subsys/molecule_list_types.F : 294f87e09017693239a3359105786600bde4f1d0af5f145fb3c9c471dfa654b4
 cp2k/src/subsys/molecule_types.F : 0a893fc573a3bf81762821498fc31186cd844df80727f07424b7fc190af5ec1f
-test_fypp.f90 : 3dc115bbf6282679af795e41516c431e99dd85316097008d5df1614ade330096
+test_fypp.f90 : 31f61e4343e01cc9a981165b2905372ed51236653e304a5948990672df2510e9
 wannier90/pwscf/post_v6.2.1/pw2wannier90.f90 : e41bc8f625bd729bd16ef8ae54b3e9bb909a6cc606d75c72cf9f04f47272f7fe
 wannier90/pwscf/v3.2.3/pw2wannier90.f90 : 9db89aacccc86da7297c2cd8b38eaa118ca9a917e2c5c10f4ac782cb7f723eb7
 wannier90/pwscf/v3.2.3/wannier.f90 : c4d7d9c40d3459f837283474545ddcb922a776ddfb6f30866c9402351d2047bc

fprettify/__init__.py

@@ -586,7 +586,7 @@ def process_lines_of_fline(self, f_line, lines, rel_ind, rel_ind_con,
                     what_con, f_line), "debug", filename, line_nr)
                 if len(scopes) > 0:
                     what = scopes[-1]
-                    if what == what_con:
+                    if what == what_con or indent_fypp:
                         valid_con = True
 
         # check statements that end scope
@@ -600,7 +600,8 @@ def process_lines_of_fline(self, f_line, lines, rel_ind, rel_ind_con,
                     what_end, f_line), "debug", filename, line_nr)
                 if len(scopes) > 0:
                     what = scopes.pop()
-                    if what == what_end or not self._parser['end'][what_end].spec:
+                    if (what == what_end or not self._parser['end'][what_end].spec
+                        or indent_fypp):
                         valid_end = True
                         log_message("{}: {}".format(
                             what_end, f_line), "debug", filename, line_nr)
@@ -858,12 +859,15 @@ def inspect_ffile_format(infile, indent_size, strict_indent, indent_fypp=False,
     stream = InputStream(infile, filter_fypp=not indent_fypp, orig_filename=orig_filename)
     prev_offset = 0
     first_indent = -1
+    has_fypp = False
 
     while 1:
         f_line, _, lines = stream.next_fortran_line()
         if not lines:
             break
 
+        if FYPP_LINE_RE.search(f_line): has_fypp = True
+
         f_line, lines, label = preprocess_labels(f_line, lines)
 
         offset = len(lines[0]) - len(lines[0].lstrip(' '))
@@ -880,7 +884,7 @@ def inspect_ffile_format(infile, indent_size, strict_indent, indent_fypp=False,
 
         prev_offset = offset
 
-    return indents, first_indent
+    return indents, first_indent, has_fypp
 
 
 def replace_relational_single_fline(f_line, cstyle):
@@ -1468,13 +1472,16 @@ def reformat_ffile_combined(infile, outfile, impose_indent=True, indent_size=3,
     if not impose_indent:
         indent_fypp = False
 
-    scope_parser = build_scope_parser(fypp=indent_fypp, mod=indent_mod)
 
     infile.seek(0)
-    req_indents, first_indent = inspect_ffile_format(
+    req_indents, first_indent, has_fypp = inspect_ffile_format(
         infile, indent_size, strict_indent, indent_fypp, orig_filename)
     infile.seek(0)
 
+    if not has_fypp: indent_fypp = False
+
+    scope_parser = build_scope_parser(fypp=indent_fypp, mod=indent_mod)
+
     # initialization
 
     # special cases for indentation: