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

Timestamp:

2018-03-02T20:10:49Z (6 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/stanse.py (modified) (6 diffs)

tools/checkers/stanse.py

@@ -47 +47 @@
 def stanse(root, job):
         "Run Stanse on a jobfile"
-        
+
         # Convert generic jobfile to Stanse-specific jobfile format
-        
+
         inname = os.path.join(root, job)
         outname = os.path.join(root, "_%s" % os.path.basename(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()
-        
+
         output = []
         for record in records:
@@ -67 +67 @@
                 if (not arg):
                         return False
-                
+
                 if (len(arg) < 6):
                         print("Not enough jobfile record arguments")
                         return False
-                
+
                 srcfname = arg[0]
                 tgtfname = arg[1]
@@ -78 +78 @@
                 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
-                
+
                 # Only C files are interesting for us
                 if (tool != "cc"):
                         continue
-                
+
                 output.append([srcfname, tgtfname, base, options])
-        
+
         outf = open(outname, "w")
         for record in output:
                 outf.write("{%s},{%s},{%s},{%s}\n" % (record[0], record[1], record[2], record[3]))
         outf.close()
-        
+
         # Run Stanse
-        
+
         retval = subprocess.Popen(['stanse', '--checker', 'ReachabilityChecker', '--jobfile', outname]).wait()
-        
+
         # Cleanup
-        
+
         os.remove(outname)
         for record in output:
@@ -106 +106 @@
                 if (os.path.isfile(tmpfile)):
                         os.remove(tmpfile)
-        
+
         if (retval == 0):
                 return True
-        
+
         return False
 
@@ -116 +116 @@
                 usage(sys.argv[0])
                 return
-        
+
         rootdir = os.path.abspath(sys.argv[1])
         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
-        
+
         for job in jobs:
                 if (not stanse(rootdir, job)):
@@ -130 +130 @@
                         print("Failed job: %s" % job)
                         return
-        
+
         print
         print("All jobs passed")