Ignore C++ comments while checking for Singleton<T> in headers.

depot_tools/presubmit_canned_checks.py

Index: depot_tools/presubmit_canned_checks.py
===================================================================
--- depot_tools/presubmit_canned_checks.py	(revision 98268)
+++ depot_tools/presubmit_canned_checks.py	(working copy)
@@ -828,14 +828,21 @@
 
 def _CheckSingletonInHeaders(input_api, output_api, source_file_filter):
   """Checks to make sure no header files have |Singleton<|."""
-  pattern = input_api.re.compile(r'Singleton<')
+  pattern = input_api.re.compile(r'Singleton\s*<')
+
+  def strip_cpp_eol_comment(line):
+    pattern = input_api.re.compile(r'//.*$')
+    return pattern.sub('', line)

[M-A Ruel, 2011/08/26 13:12:45]

I'm not sure it's useful; using "input_api.re.sub(r'//.*$', '', line)" directly
at the call point, or on a separate named variable around like 843 since the
line would become longer, would be clearer IMHO.

wdyt?

[Denis Lagno, 2011/08/26 13:31:33]

Done.

+    
   files = []
   for f in input_api.AffectedSourceFiles(source_file_filter):
     if (f.LocalPath().endswith('.h') or f.LocalPath().endswith('.hxx') or
         f.LocalPath().endswith('.hpp') or f.LocalPath().endswith('.inl')):
       contents = input_api.ReadFile(f)
-      if pattern.search(contents):
-        files.append(f)
+      for line in contents.splitlines(False):
+        if pattern.search(strip_cpp_eol_comment(line)):
+          files.append(f)
+          break
 
   if files:
     return [ output_api.PresubmitError(