r197378 - Added -iregex for case-insensitive regex to filter file names.

Alexander Kornienko alexfh at google.com
Mon Dec 16 02:57:30 PST 2013


Author: alexfh
Date: Mon Dec 16 04:57:30 2013
New Revision: 197378

URL: http://llvm.org/viewvc/llvm-project?rev=197378&view=rev
Log:
Added -iregex for case-insensitive regex to filter file names.

Summary:
-regex and -iregex both mimic options of the find utility.
Made the default list of extensions case-insensitive, so that it's not only C
and CPP extensions are accepted in upper case.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits

Differential Revision: http://llvm-reviews.chandlerc.com/D2415

Modified:
    cfe/trunk/tools/clang-format/clang-format-diff.py

Modified: cfe/trunk/tools/clang-format/clang-format-diff.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/clang-format-diff.py?rev=197378&r1=197377&r2=197378&view=diff
==============================================================================
--- cfe/trunk/tools/clang-format/clang-format-diff.py (original)
+++ cfe/trunk/tools/clang-format/clang-format-diff.py Mon Dec 16 04:57:30 2013
@@ -43,9 +43,13 @@ def main():
                       help='apply edits to files instead of displaying a diff')
   parser.add_argument('-p', metavar='NUM', default=0,
                       help='strip the smallest prefix containing P slashes')
-  parser.add_argument('-regex', metavar='PATTERN', default=
-                      r'.*\.(cpp|cc|CPP|C|c\+\+|cxx|c|h|hpp|m|mm|inc|js)',
-                      help='custom pattern selecting file paths to reformat')
+  parser.add_argument('-regex', metavar='PATTERN', default='',
+                      help='custom pattern selecting file paths to reformat '
+                      '(case sensitive, override -iregex)')
+  parser.add_argument('-iregex', metavar='PATTERN', default=
+                      r'.*\.(cpp|cc|c\+\+|cxx|c|h|hpp|m|mm|inc|js)',
+                      help='custom pattern selecting file paths to reformat '
+                      '(case insensitive, override -regex)')
   parser.add_argument(
       '-style',
       help=
@@ -62,8 +66,12 @@ def main():
     if filename == None:
       continue
 
-    if not re.match(args.regex, filename):
-      continue
+    if args.regex != '':
+      if not re.match(args.regex, filename):
+        continue
+    else:
+      if not re.match(args.iregex, filename, re.IGNORECASE):
+        continue
 
     match = re.search('^@@.*\+(\d+)(,(\d+))?', line)
     if match:





More information about the cfe-commits mailing list