[Fuego] [PATCH 16/16] a bit of cleaning and style fixes

[Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>]

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 engine/scripts/functions.sh |  2 +-
 engine/scripts/ovgen.py     | 17 ++---------------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
index 4379271..e499ab4 100755
--- a/engine/scripts/functions.sh
+++ b/engine/scripts/functions.sh
@@ -500,7 +500,7 @@ function log_compare {
 	  return $FUEGO_RESULT
   fi
 
-  cd ${LOGDIR} 
+  cd ${LOGDIR}
   LOGFILE="testlog.txt"
   PARSED_LOGFILE="testlog.${4}.txt"
 
diff --git a/engine/scripts/ovgen.py b/engine/scripts/ovgen.py
index 10d1cf4..4b25d86 100755
--- a/engine/scripts/ovgen.py
+++ b/engine/scripts/ovgen.py
@@ -37,7 +37,6 @@ OFVAR_DESCRIPTION="DESCRIPTION"
 LVAR_NAME="NAME"
 LVAR_DESCRIPTION="DESCRIPTION"
 
-
 class OFClass:
     def __init__(self):
         self.name=""
@@ -65,7 +64,6 @@ class OFLayer:
     def __str__(self):
         return "<OFLayer name:\"%s\" descr:\"%s\" vars:%s>\n" % (self.name, self.description, self.vars)
 
-
 class TestSpecs:
     def __init__(self):
         self.name=""
@@ -108,7 +106,6 @@ class SpecException(Exception):
      def __str__(self):
          return repr(self.value)
 
-
 def debug_print(string, lev=1):
     if lev <= log_lvl:
         print "log: " + string
@@ -130,7 +127,6 @@ def parseOFVars(line, ofc):
 
     return True
 
-
 # parse variables definitions
 def parseVars(line, ofc):
     m = re.search("(\w+)=\"(.*)\"", line)
@@ -164,7 +160,6 @@ def parseFunctionBody(name, f):
 
     return funcbody
 
-
 def parseFunction(line, f):
     m = re.search("\s?function (\w+).*{", line)
     if m==None:
@@ -209,7 +204,6 @@ def parseBaseFile(baseFilePath, ofc):
         elif baseParseFunction(line, f, ofc):
             debug_print("function found", 3)
 
-
 # parse all base files in dir
 def parseBaseDir(baseDirPath, ofcls):
     debug_print ("\n------------\nparsing " + baseDirPath + " fuegoclass dir ...\n")
@@ -221,13 +215,12 @@ def parseBaseDir(baseDirPath, ofcls):
         debug_print ("parsed %s class\n------------\n" % (ofc.name))
         ofcls[ofc.name]=(ofc)
 
-
 def parseInherit(line, ofcls):
     m = re.search("inherit \"(.+)\"", line)
-    if m==None: return None
+    if m == None:
+        return None
     clname = m.group(1)
 
-
     if clname not in ofcls:
         raise OFClassNotFoundException("No such class: %s" % (clname))
 
@@ -259,7 +252,6 @@ def parseLayerVarOverride(line, layer, inhclass):
 
     return True
 
-
 def parseLayerFuncOverride(line, layer, inhclass, f):
     m = re.search("override-func (\w+)(.*)", line)
     if m==None: return False
@@ -322,7 +314,6 @@ def parseLayerCapList(line, layer, inhclass):
 
     return True
 
-
 def parseOverrideFile(overrideFile, layer, ofcls):
     debug_print ("\n-----------\nparsing %s override ...\n" % (overrideFile))
     f = open(overrideFile)
@@ -472,7 +463,6 @@ def parseSpec(testdir, testspec):
 
 def run(test_args=None):
     parser = argparse.ArgumentParser(description='Read OF class files, override files and generate prolog defining all variables and functions')
-
     parser.add_argument('--classdir', help='OF base class directory', required=True)
     parser.add_argument('--ovfiles', nargs='+', metavar='OVFILE', help='list of directories containing .override files', required=True)
     parser.add_argument('--testdir', help='e.g.: Benchmark.Dhrystone', required=True)
@@ -483,11 +473,9 @@ def run(test_args=None):
     args = parser.parse_args(args=test_args)
 
     if args.debug:
-
         if args.debug < 1 or args.debug > 3:
             print "Error: wrong debug lvl: %s" % (args.debug)
             sys.exit
-
         global log_lvl
         log_lvl = args.debug
 
@@ -497,7 +485,6 @@ def run(test_args=None):
     parseBaseDir(args.classdir, ofcls)
 
     layers = {}
-
     classes = []
     for ovf in args.ovfiles:
         classes = classes + parseOverrideFile(ovf, layers, ofcls)
-- 
2.7.4