align labelled continue statements: run

Author: perazz

scripts/align_labelled_continue.py

@@ -0,0 +1,43 @@
+# Revert the ugly labelled continue statements created by fprettify
+
+def revert_fprettify_labels(source_folder,file_name):
+
+    import re
+    import os
+
+    # Load whole file; split by lines
+    with open(os.path.join(source_folder,file_name), 'r') as file:
+        # Create an empty list to store the lines
+        file_body = []
+
+        # Iterate over the lines of the file
+        for line in file:
+            file_body.append(line.rstrip())
+
+
+    file.close()
+
+    for i in range(len(file_body)):
+       if 'continue' in file_body[i]:
+           old = file_body[i]
+           nspaces = len(file_body[i-1])-len(file_body[i-1].lstrip())
+           file_body[i] = re.sub(r'(\s*)([0-9]+)(\s*)(continue)(\s*)'," "*nspaces+r'\2 \4',old)
+
+    # Write out
+    fid = open(os.path.join(source_folder,file_name), 'w')
+    for i in range(len(file_body)):
+        fid.write("{}\n".format(file_body[i]))
+    fid.close()
+
+
+# Launch script
+revert_fprettify_labels("../src","stdlib_linalg_lapack_s.f90")
+revert_fprettify_labels("../src","stdlib_linalg_lapack_d.f90")
+revert_fprettify_labels("../src","stdlib_linalg_lapack_q.f90")
+revert_fprettify_labels("../src","stdlib_linalg_lapack_c.f90")
+revert_fprettify_labels("../src","stdlib_linalg_lapack_z.f90")
+revert_fprettify_labels("../src","stdlib_linalg_lapack_w.f90")
+
+
+
+

scripts/modularize_blas.py

@@ -436,12 +436,12 @@ def double_to_quad(lines,initial,newinit,prefix,procedure_name=None):
         initial = sing_prefixes[i]
         newinit = dble_prefixes[i]
         whole = re.sub(prefix[:-1]+r'\_'+initial,prefix+newinit,whole)
-        # whole = re.sub(r'\_'+initial,r'_'+newinit,whole)
-
-        if initial=='s':
-            whole = re.sub(prefix[:-1]+r'\_delctg',prefix+r'selctg',whole)
-            whole = re.sub(prefix[:-1]+r'\_delect',prefix+r'select',whole)
 
+    whole = re.sub(prefix[:-1]+r'\_delctg',prefix+r'selctg',whole)
+    whole = re.sub(prefix[:-1]+r'\_delect',prefix+r'select',whole)
+    whole = re.sub(prefix[:-1]+r'\_dlag2d',prefix+r'dlag2q',whole)
+    whole = re.sub(prefix[:-1]+r'\_zlag2z',prefix+r'zlag2w',whole)
+    whole = re.sub(prefix[:-1]+r'\_zlag2w',prefix+r'clag2z',whole)
 
     whole = re.sub(r'32\-bit',r'64-bit',whole)
     whole = re.sub(r'single precision',r'double precision',whole)
@@ -1147,6 +1147,7 @@ def write_function_body(fid,body,INDENT,MAX_LINE_LENGTH,adjust_comments):
     fid.write("\n")
 
     header = True
+    previous = []
 
     for i in range(len(body)):
        line = body[i]
@@ -1192,6 +1193,8 @@ def write_function_body(fid,body,INDENT,MAX_LINE_LENGTH,adjust_comments):
        if not is_comment_line:
            line = re.sub(r"([\"'])((?=(\\?))\3.)*?\1", upper_repl, line)
 
+           line = align_labelled_continue(line,previous)
+
        if is_directive:
            fid.write(line+"\n")
        elif bool(re.match(r'^\s*!\s*$',line)):
@@ -1200,6 +1203,9 @@ def write_function_body(fid,body,INDENT,MAX_LINE_LENGTH,adjust_comments):
        else:
            write_with_continuation(line,fid,INDENT,MAX_LINE_LENGTH)
 
+       # Save for the next one
+       previous = line
+
 
 
 # Write with continuation
@@ -1472,20 +1478,35 @@ def to_quad_precision(self):
             print("function "+self.old_name+" cannot be converted to quadruple precision: it must be double")
             exit(1)
 
-        q.old_name = newi + self.old_name[len(initial):]
 
         # Extract prefix
         i = self.new_name.index(self.old_name)
-        prefix     = self.new_name[:i]
+        prefix = self.new_name[:i]
+
+
+        # Patch for names that change more than just the initial
+        if self.old_name=='slag2d':
+            q.old_name = 'dlag2q'
+        else:
+            q.old_name = newi + self.old_name[len(initial):]
         q.new_name = prefix + q.old_name
 
-        #print("double->quad "+q.old_name+" "+q.new_name)
+        print("double->quad "+q.old_name+" "+q.new_name)
 
         # Body, header
         q.header   = double_to_quad(q.header,initial,newi,prefix,[self.old_name,q.old_name])
         q.body     = double_to_quad(q.body,initial,newi,prefix)
         q.decl     = double_to_quad(q.decl,initial,newi,prefix)
 
+        if (self.old_name=='slag2d'):
+            print("self old "+self.old_name)
+            print("q old"+q.old_name)
+            print("self new "+self.new_name)
+            print("q new"+q.new_name)
+            print("self line 1 "+self.body[0])
+            print("q line 1 "+q.body[0])
+            #exit(1)
+
         # Parameters: we only rename type and value
         q.ptype    = double_to_quad(q.ptype,initial,newi,prefix)
         q.pvalue   = double_to_quad(q.pvalue,initial,newi,prefix)
@@ -1540,6 +1561,10 @@ def is_pure(self):
 
         DEBUG = False # self.old_name=='sisnan'
 
+        # Patch
+        if self.old_name=='dnrm2' or self.old_name=='znrm2' or self.old_name=='qznrm2' \
+        or self.old_name=='qnrm2': return True
+
         io = 'stop' in self.body or \
              'write' in self.body or \
              self.save_stmt;
@@ -2174,6 +2199,10 @@ def align_labelled_continue(line,previous=None):
 
         nspaces = len(previous)-len(previous.lstrip())
 
+        print("CONTINUE: # spaces  = "+str(nspaces))
+        print("CONTINUE: prev line = "+previous)
+        print("CONTINUE:           = "+" "*nspaces + label + " continue")
+
         return " "*nspaces + label + " continue"
 
 # Given the list of all variables, extract those that are module constants

scripts/run_fprettify.sh

@@ -5,3 +5,6 @@ python3 modularize_blas.py
 
 # prettify
 fprettify -i 4 -l 132 -w 2 --disable-indent --strip-comments --c-relations --enable-replacements --enable-decl --whitespace-comma 0 --recursive ../src/
+
+# Revert ugly changes at labelled continue statements
+python3 align_labelled_continue.py

src/stdlib_linalg_blas_d.f90

@@ -840,7 +840,8 @@ end subroutine stdlib_dger
      !> name, so that
      !> DNRM2 := sqrt( x'*x )
 
-     pure real(dp) function stdlib_dnrm2(n,x,incx)
+     pure function stdlib_dnrm2(n,x,incx)
+        real(dp) :: stdlib_dnrm2
         ! -- reference blas level1 routine (version 3.9.1_dp) --
         ! -- reference blas is a software package provided by univ. of tennessee,    --
         ! -- univ. of california berkeley, univ. of colorado denver and nag ltd..--

src/stdlib_linalg_blas_q.f90

@@ -842,7 +842,8 @@ end subroutine stdlib_qger
      !> name, so that
      !> DNRM2 := sqrt( x'*x )
 
-     pure real(qp) function stdlib_qnrm2(n,x,incx)
+     pure function stdlib_qnrm2(n,x,incx)
+        real(qp) :: stdlib_qnrm2
         ! -- reference blas level1 routine (version 3.9.1_qp) --
         ! -- reference blas is a software package provided by univ. of tennessee,    --
         ! -- univ. of california berkeley, univ. of colorado denver and nag ltd..--
@@ -4414,6 +4415,8 @@ pure real(qp) function stdlib_qzasum(n,zx,incx)
            return
      end function stdlib_qzasum
 
+     !> !
+     !>
      !> DZNRM2: returns the euclidean norm of a vector via the function
      !> name, so that
      !> DZNRM2 := sqrt( x**H*x )