X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Fsort_includes.py;h=fef97550db8d8f84ec5e012246ecbf2ca5d88424;hb=db9fa461d7d9643a1b25f13df73638be9c36cafb;hp=6f20cb76e4831c52e6b3e69858a779050a7dddb3;hpb=0cd94c71db19c0a53d1d97f353116e271884a336;p=oota-llvm.git

diff --git a/utils/sort_includes.py b/utils/sort_includes.py
index 6f20cb76e48..fef97550db8 100755
--- a/utils/sort_includes.py
+++ b/utils/sort_includes.py
@@ -10,13 +10,21 @@ welcome for more functionality, and sorting other header groups.
 
 import argparse
 import os
-import re
-import sys
-import tempfile
 
 def sort_includes(f):
+  """Sort the #include lines of a specific file."""
+
+  # Skip files which are under INPUTS trees or test trees.
+  if 'INPUTS/' in f.name or 'test/' in f.name:
+    return
+
+  ext = os.path.splitext(f.name)[1]
+  if ext not in ['.cpp', '.c', '.h', '.inc', '.def']:
+    return
+
   lines = f.readlines()
-  look_for_api_header = f.name[-4:] == '.cpp'
+  look_for_api_header = ext in ['.cpp', '.c']
+  found_headers = False
   headers_begin = 0
   headers_end = 0
   api_headers = []
@@ -27,18 +35,20 @@ def sort_includes(f):
     if l.strip() == '':
       continue
     if l.startswith('#include'):
-      if headers_begin == 0:
+      if not found_headers:
         headers_begin = i
+        found_headers = True
       headers_end = i
       header = l[len('#include'):].lstrip()
       if look_for_api_header and header.startswith('"'):
         api_headers.append(header)
         look_for_api_header = False
         continue
-      if header.startswith('<'):
+      if header.startswith('<') or header.startswith('"gtest/'):
         system_headers.append(header)
         continue
-      if header.startswith('"llvm/') or header.startswith('"clang/'):
+      if (header.startswith('"llvm/') or header.startswith('"llvm-c/') or
+          header.startswith('"clang/') or header.startswith('"clang-c/')):
         project_headers.append(header)
         continue
       local_headers.append(header)
@@ -46,23 +56,21 @@ def sort_includes(f):
 
     # Only allow comments and #defines prior to any includes. If either are
     # mixed with includes, the order might be sensitive.
-    if headers_begin != 0:
+    if found_headers:
       break
-    if l.startswith('//') or l.startswith('#define'):
+    if l.startswith('//') or l.startswith('#define') or l.startswith('#ifndef'):
       continue
     break
-  if headers_begin == 0:
+  if not found_headers:
     return
 
-  local_headers.sort()
-  project_headers.sort()
-  system_headers.sort()
+  local_headers = sorted(set(local_headers))
+  project_headers = sorted(set(project_headers))
+  system_headers = sorted(set(system_headers))
   headers = api_headers + local_headers + project_headers + system_headers
   header_lines = ['#include ' + h for h in headers]
   lines = lines[:headers_begin] + header_lines + lines[headers_end + 1:]
 
-  #for l in lines[headers_begin:headers_end]:
-  #  print l.rstrip()
   f.seek(0)
   f.truncate()
   f.writelines(lines)