Changeset a35b458 in mainline for tools/checkers/vcc.py

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• tools/checkers/vcc.py (modified) (4 diffs)

tools/checkers/vcc.py

@@ -53 +53 @@
 def cygpath(upath):
         "Convert Unix (Cygwin) path to Windows path"
-        
+
         return subprocess.Popen(['cygpath', '--windows', '--absolute', upath], stdout = subprocess.PIPE).communicate()[0].strip()
 
 def preprocess(srcfname, tmpfname, base, options):
         "Preprocess source using GCC preprocessor and compatibility tweaks"
-        
+
         global specification
-        
+
         args = ['gcc', '-E']
         args.extend(options.split())
         args.extend(['-DCONFIG_VERIFY_VCC=1', srcfname])
-        
+
         # Change working directory
-        
+
         cwd = os.getcwd()
         os.chdir(base)
-        
+
         preproc = subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
-        
+
         tmpf = open(tmpfname, "w")
         tmpf.write(specification)
-        
+
         for line in preproc.splitlines():
-                
+
                 # Ignore preprocessor directives
-                
+
                 if (line.startswith('#')):
                         continue
-                
+
                 # Remove __attribute__((.*)) GCC extension
-                
+
                 line = re.sub(re_attribute, "", line)
-                
+
                 # Ignore unsupported __builtin_va_list type
                 # (a better solution replacing __builrin_va_list with
                 # an emulated implementation is needed)
-                
+
                 line = re.sub(re_va_list, "void *", line)
-                
+
                 tmpf.write("%s\n" % line)
-        
+
         tmpf.close()
-        
+
         os.chdir(cwd)
-        
+
         return True
 
 def vcc(vcc_path, root, job):
         "Run Vcc on a jobfile"
-        
+
         # Parse jobfile
-        
+
         inname = os.path.join(root, job)
-        
+
         if (not os.path.isfile(inname)):
                 print("Unable to open %s" % inname)
                 print("Did you run \"make precheck\" on the source tree?")
                 return False
-        
+
         inf = open(inname, "r")
         records = inf.read().splitlines()
         inf.close()
-        
+
         for record in records:
                 arg = jobfile.parse_arg(record)
                 if (not arg):
                         return False
-                
+
                 if (len(arg) < 6):
                         print("Not enough jobfile record arguments")
                         return False
-                
+
                 srcfname = arg[0]
                 tgtfname = arg[1]
@@ -131 +131 @@
                 base = arg[4]
                 options = arg[5]
-                
+
                 srcfqname = os.path.join(base, srcfname)
                 if (not os.path.isfile(srcfqname)):
                         print("Source %s not found" % srcfqname)
                         return False
-                
+
                 tmpfname = "%s.preproc" % srcfname
                 tmpfqname = os.path.join(base, tmpfname)
-                
+
                 vccfname = "%s.i" % srcfname
                 vccfqname = os.path.join(base, vccfname);
-                
+
                 # Only C files are interesting for us
                 if (tool != "cc"):
                         continue
-                
+
                 # Preprocess sources
-                
+
                 if (not preprocess(srcfname, tmpfname, base, options)):
                         return False
-                
+
                 # Run Vcc
                 print(" -- %s --" % srcfname)
                 retval = subprocess.Popen([vcc_path, '/pointersize:32', '/newsyntax', cygpath(tmpfqname)]).wait()
-                
+
                 if (retval != 0):
                         return False
-                
+
                 # Cleanup, but only if verification was successful
                 # (to be able to examine the preprocessed file)
-                
+
                 if (os.path.isfile(tmpfqname)):
                         os.remove(tmpfqname)
                         os.remove(vccfqname)
-        
+
         return True
 
 def main():
         global specification
-        
+
         if (len(sys.argv) < 2):
                 usage(sys.argv[0])
                 return
-        
+
         rootdir = os.path.abspath(sys.argv[1])
         if (len(sys.argv) > 2):
@@ -180 +180 @@
         else:
                 vcc_path = "/cygdrive/c/Program Files (x86)/Microsoft Research/Vcc/Binaries/vcc"
-        
+
         if (not os.path.isfile(vcc_path)):
                 print("%s is not a binary." % vcc_path)
                 print("Please supply the full Cygwin path to Vcc as the second argument.")
                 return
-        
+
         config = os.path.join(rootdir, "HelenOS.config")
-        
+
         if (not os.path.isfile(config)):
                 print("%s not found." % config)
                 print("Please specify the path to HelenOS build tree root as the first argument.")
                 return
-        
+
         specpath = os.path.join(rootdir, "tools/checkers/vcc.h")
         if (not os.path.isfile(specpath)):
                 print("%s not found." % config)
                 return
-        
+
         specfile = file(specpath, "r")
         specification = specfile.read()
         specfile.close()
-        
+
         for job in jobs:
                 if (not vcc(vcc_path, rootdir, job)):
@@ -207 +207 @@
                         print("Failed job: %s" % job)
                         return
-        
+
         print()
         print("All jobs passed")