X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Flint%2Fcommon_lint.py;h=e982680c052ad2669365edf91373d0a69f81688d;hb=46995fa7e2eead5759d13ddc64ef073c1d527f12;hp=18263838b09b84ea1fb055d6c895e0b7b133115b;hpb=cb5852d1f7a45dcb3c8a56120ba16b2c1825c990;p=oota-llvm.git

diff --git a/utils/lint/common_lint.py b/utils/lint/common_lint.py
index 18263838b09..e982680c052 100644
--- a/utils/lint/common_lint.py
+++ b/utils/lint/common_lint.py
@@ -5,36 +5,68 @@
 import re
 
 def VerifyLineLength(filename, lines, max_length):
-  """Checkes to make sure the file has no lines with lines exceeding the length
+  """Checks to make sure the file has no lines with lines exceeding the length
   limit.
 
   Args:
     filename: the file under consideration as string
     lines: contents of the file as string array
     max_length: maximum acceptable line length as number
+
+  Returns:
+    A list of tuples with format [(filename, line number, msg), ...] with any
+    violations found.
   """
+  lint = []
   line_num = 1
   for line in lines:
-    length = len(line.rstrip())
+    length = len(line.rstrip('\n'))
     if length > max_length:
-      print '%s:%d:Line exceeds %d chars (%d)' % (filename, line_num,
-                                                  max_length, length)
+      lint.append((filename, line_num,
+                   'Line exceeds %d chars (%d)' % (max_length, length)))
+    line_num += 1
+  return lint
+
+def VerifyTabs(filename, lines):
+  """Checks to make sure the file has no tab characters.
+
+  Args:
+    filename: the file under consideration as string
+    lines: contents of the file as string array
+
+  Returns:
+    A list of tuples with format [(line_number, msg), ...] with any violations
+    found.
+  """
+  lint = []
+  tab_re = re.compile(r'\t')
+  line_num = 1
+  for line in lines:
+    if tab_re.match(line.rstrip('\n')):
+      lint.append((filename, line_num, 'Tab found instead of whitespace'))
     line_num += 1
+  return lint
 
 
 def VerifyTrailingWhitespace(filename, lines):
-  """Checkes to make sure the file has no lines with trailing whitespace.
+  """Checks to make sure the file has no lines with trailing whitespace.
 
   Args:
     filename: the file under consideration as string
     lines: contents of the file as string array
+
+  Returns:
+    A list of tuples with format [(filename, line number, msg), ...] with any
+    violations found.
   """
+  lint = []
   trailing_whitespace_re = re.compile(r'\s+$')
   line_num = 1
   for line in lines:
-    if trailing_whitespace_re.match(line.rstrip()):
-      print '%s:%d:Trailing whitespace' % (filename, line_num)
+    if trailing_whitespace_re.match(line.rstrip('\n')):
+      lint.append((filename, line_num, 'Trailing whitespace'))
     line_num += 1
+  return lint
 
 
 class BaseLint:
@@ -42,17 +74,24 @@ class BaseLint:
     raise Exception('RunOnFile() unimplemented')
 
 
-def RunLintOverAllFiles(lint, filenames):
+def RunLintOverAllFiles(linter, filenames):
   """Runs linter over the contents of all files.
 
   Args:
     lint: subclass of BaseLint, implementing RunOnFile()
     filenames: list of all files whose contents will be linted
+
+  Returns:
+    A list of tuples with format [(filename, line number, msg), ...] with any
+    violations found.
   """
+  lint = []
   for filename in filenames:
     file = open(filename, 'r')
     if not file:
       print 'Cound not open %s' % filename
       continue
     lines = file.readlines()
-    lint.RunOnFile(filename, lines)
+    lint.extend(linter.RunOnFile(filename, lines))
+
+  return lint