|
@@ -27,13 +27,6 @@ namespace {
|
|
|
// Short namespaces don't need an end comment.
|
|
|
static const int kShortNamespaceMaxLines = 1;
|
|
|
|
|
|
-// Matches a valid namespace end comment.
|
|
|
-// Valid namespace end comments don't need to be edited.
|
|
|
-static llvm::Regex kNamespaceCommentPattern =
|
|
|
- llvm::Regex("^/[/*] *(end (of )?)? *(anonymous|unnamed)? *"
|
|
|
- "namespace( +([a-zA-Z0-9:_]+))?\\.? *(\\*/)?$",
|
|
|
- llvm::Regex::IgnoreCase);
|
|
|
-
|
|
|
// Computes the name of a namespace given the namespace token.
|
|
|
// Returns "" for anonymous namespace.
|
|
|
std::string computeName(const FormatToken *NamespaceTok) {
|
|
@@ -67,8 +60,15 @@ bool hasEndComment(const FormatToken *RBraceTok) {
|
|
|
bool validEndComment(const FormatToken *RBraceTok, StringRef NamespaceName) {
|
|
|
assert(hasEndComment(RBraceTok));
|
|
|
const FormatToken *Comment = RBraceTok->Next;
|
|
|
+
|
|
|
+ // Matches a valid namespace end comment.
|
|
|
+ // Valid namespace end comments don't need to be edited.
|
|
|
+ static llvm::Regex *const NamespaceCommentPattern =
|
|
|
+ new llvm::Regex("^/[/*] *(end (of )?)? *(anonymous|unnamed)? *"
|
|
|
+ "namespace( +([a-zA-Z0-9:_]+))?\\.? *(\\*/)?$",
|
|
|
+ llvm::Regex::IgnoreCase);
|
|
|
SmallVector<StringRef, 7> Groups;
|
|
|
- if (kNamespaceCommentPattern.match(Comment->TokenText, &Groups)) {
|
|
|
+ if (NamespaceCommentPattern->match(Comment->TokenText, &Groups)) {
|
|
|
StringRef NamespaceNameInComment = Groups.size() > 5 ? Groups[5] : "";
|
|
|
// Anonymous namespace comments must not mention a namespace name.
|
|
|
if (NamespaceName.empty() && !NamespaceNameInComment.empty())
|