Make add_new_check.py's insertion of registerCheck<> match the sort order
Summary:
Following on from review comments in D65919 about the ordering
of the registerCheck<> calls. Sort based on the check name which might
be on the line after the registerCheck<>
Reviewers: aaron.ballman
Subscribers: cfe-commits, llvm-commits
Tags: #clang
Differential Revision: https://reviews.llvm.org/D66505
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@370527 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clang-tidy/add_new_check.py b/clang-tidy/add_new_check.py
index 6a06e6d..bba16cc 100755
--- a/clang-tidy/add_new_check.py
+++ b/clang-tidy/add_new_check.py
@@ -165,31 +165,50 @@
header_added = False
header_found = False
check_added = False
+ check_fq_name = module + '-' + check_name
check_decl = (' CheckFactories.registerCheck<' + check_name_camel +
- '>(\n "' + module + '-' + check_name + '");\n')
+ '>(\n "' + check_fq_name + '");\n')
- for line in lines:
- if not header_added:
- match = re.search('#include "(.*)"', line)
- if match:
- header_found = True
- if match.group(1) > check_name_camel:
+ lines = iter(lines)
+ try:
+ while True:
+ line = lines.next()
+ if not header_added:
+ match = re.search('#include "(.*)"', line)
+ if match:
+ header_found = True
+ if match.group(1) > check_name_camel:
+ header_added = True
+ f.write('#include "' + check_name_camel + '.h"\n')
+ elif header_found:
header_added = True
f.write('#include "' + check_name_camel + '.h"\n')
- elif header_found:
- header_added = True
- f.write('#include "' + check_name_camel + '.h"\n')
- if not check_added:
- if line.strip() == '}':
- check_added = True
- f.write(check_decl)
- else:
- match = re.search('registerCheck<(.*)>', line)
- if match and match.group(1) > check_name_camel:
+ if not check_added:
+ if line.strip() == '}':
check_added = True
f.write(check_decl)
- f.write(line)
+ else:
+ match = re.search('registerCheck<(.*)> *\( *(?:"([^"]*)")?', line)
+ prev_line = None
+ if match:
+ current_check_name = match.group(2)
+ if current_check_name is None:
+ # If we didn't find the check name on this line, look on the
+ # next one.
+ prev_line = line
+ line = lines.next()
+ match = re.search(' *"([^"]*)"', line)
+ if match:
+ current_check_name = match.group(1)
+ if current_check_name > check_fq_name:
+ check_added = True
+ f.write(check_decl)
+ if prev_line:
+ f.write(prev_line)
+ f.write(line)
+ except StopIteration:
+ pass
# Adds a release notes entry.
