Fix indentation of OpenMP directives

!$OMP lines are now consistently treated as comments

!$ conditional Fortran code is handled as before: `!$` is moved to beginning
of line and Fortran code is prettified

fixes #35

Author: pseewald

fprettify/__init__.py

@@ -1212,11 +1212,7 @@ def preprocess_line(f_line, lines, comments, filename, line_nr):
     do_format = False
     is_fypp = False
 
-    if OMP_DIR_RE.search(f_line):
-        # move '!$OMP' to line start, otherwise don't format omp directives
-        lines = ['!$OMP' + (len(l) - len(l.lstrip())) *
-                 ' ' + OMP_DIR_RE.sub('', l, count=1) for l in lines]
-    elif EMPTY_RE.search(f_line):  # empty lines including comment lines
+    if EMPTY_RE.search(f_line):  # empty lines including comment lines
         if any(comments):
             if lines[0].startswith(' '):
                 # indent comment lines only if they were not indented before.

fprettify/fparse_utils.py

@@ -180,8 +180,8 @@ def next_fortran_line(self):
                 # but remember to convert them back
 
                 what_omp = ''
-                if OMP_SUBS_RE.search(line):
-                    what_omp = OMP_SUBS_RE.search(line).group(1)
+                if OMP_RE.search(line) and not OMP_DIR_RE.search(line):
+                    what_omp = OMP_RE.search(line).group(1)
                     line = line.replace(what_omp, '', 1)
                 line_start = 0
 

fprettify/tests/__init__.py

@@ -398,6 +398,26 @@ def test_do(self):
 
         self.assert_fprettify_result([], instring, instring)
 
+    def test_omp(self):
+        """test formatting of omp directives"""
+        instring = ("PROGRAM test_omp\n"
+                    " !$OMP    PARALLEL DO\n"
+                    "b=4\n"
+                    "!$a=b\n"
+                    "   !$    c=b\n"
+                    "!$OMP END  PARALLEL DO\n"
+                    "END PROGRAM")
+        outstring = ("PROGRAM test_omp\n"
+                     "   !$OMP    PARALLEL DO\n"
+                     "   b = 4\n"
+                     "!$ a = b\n"
+                     "!$ c = b\n"
+                     "!$OMP END  PARALLEL DO\n"
+                     "END PROGRAM")
+
+        self.assert_fprettify_result([], instring, outstring)
+
+
 def addtestmethod(testcase, fpath, ffile):
     """add a test method for each example."""