python3 fixes for flowercase and fdeclarations

ylikx · Feb 7, 2017 · 0ae8f47 · 0ae8f47
1 parent 765e27a
commit 0ae8f47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/fdeclarations/fdeclarations.py b/fdeclarations/fdeclarations.py
@@ -60,11 +60,13 @@
 
 """
 
+from __future__ import print_function
+
 import re
 import sys
 
 TYPEKEYS = ['integer', 'logical', 'real', 'complex',
-            'double precision', 'double complex']
+            'double precision', 'double complex', 'character', 'doubleprecision', 'doublecomplex']
 
 #m = re.search(r'(subroutine|function)(.*?)\((.*?)\)', s)
 
@@ -98,7 +100,6 @@ def getDeclString(self):
            string += " =" + self.initialiser
         return string
 
-# TODO
 class FortranSubroutineHeader:
     def __init__(name, arglist):
         self.name = ''
@@ -298,16 +299,16 @@ def printWrapperCode(subname, arglist, varlist):
     #for entry in arglist:
     #    print "!> @param        " + entry
     print("subroutine " + subname + "_wrapper(" + ','.join(arglist) + ')')
-    print
+    print()
     print("  implicit none")
-    print
+    print()
     # parameters first
     print( "  ! Parameters")
     for entry in varlist:
         if not entry.is_argument and entry.is_parameter:
             print ("  " + entry.getDeclString())
     # print scalar arguments
-    print
+    print()
     print( "  ! Arguments")
     for entry in varlist:
         if entry.is_argument:
@@ -318,15 +319,15 @@ def printWrapperCode(subname, arglist, varlist):
     #for entry in varlist:
     #    if entry.is_argument and entry.dim:
     #        print "  " + entry.getDeclString()
-    print
-    print "  ! Former local variables of " + subname
+    print()
+    print("  ! Former local variables of " + subname)
     for entry in varlist:
         if not entry.is_argument:
-            print "  ! " + entry.getDeclString()
+            print("  ! " + entry.getDeclString())
 
-    print
+    print()
     print ("  call " + subname + "(" + ','.join(arglist) + ')')
-    print
+    print()
     print("end subroutine")
 
 if __name__ == "__main__":
@@ -348,7 +349,7 @@ class NoArgList:
             break
 
     if not args:
-        print "ERROR: no subroutine header found!"
+        print("ERROR: no subroutine header found!")
         raise NoArgList
 
     vardict = {}

diff --git a/flowercase/flowercase.py b/flowercase/flowercase.py
@@ -32,6 +32,8 @@
 # ylikx.0 at gmail
 # https://www.github.com/ylikx/
 
+from __future__ import print_function
+
 import sys
 
 infile = open(sys.argv[1], 'r')
@@ -48,7 +50,7 @@
   stringmode = False
 
   for character in line:
-    if not character.isalnum() and character<>'_':
+    if not character.isalnum() and character != '_':
 
       if not stringmode and not commentmode:
         if word.isupper(): # means: do not convert mixed case words
@@ -71,6 +73,6 @@
     else:
       word += character
 
-  print line_new,
+  print(line_new, end="")
 
 infile.close()