Tweak |in_blink_namespace|, to look at ancestors *and also* at qualifiers.

tools/clang/rewrite_to_chrome_style/RewriteToChromeStyle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // Changes Blink-style names to Chrome-style names. Currently transforms:
 //   fields:
 //     int m_operationCount => int operation_count_
 //   variables (including parameters):
 //     int mySuperVariable => int my_super_variable
 //   constants:
@@ skipping 169 matching lines @@
 // Matches |T::m| DependentScopeDeclRefExpr if InnerMatcher matches |T|.
 AST_MATCHER_P(
     clang::DependentScopeDeclRefExpr,
     dependentScopeIfQualifier,
     clang::ast_matchers::internal::Matcher<clang::NestedNameSpecifier>,
     InnerMatcher) {
   clang::NestedNameSpecifier* qual = Node.getQualifier();
   return qual && InnerMatcher.matches(*qual, Finder, Builder);
 }
 
+// Matches |T::f| DependentScopeDeclRefExpr if InnerMatcher matches |T|.
+AST_MATCHER_P(
+    clang::DeclaratorDecl,
+    declaratorDeclHasQualifier,

[Łukasz Anforowicz, 2016/08/24 19:20:21]

Ideally I would name this |hasQualifier|, but if I do this, I always get "call
to 'hasQualifier' is ambiguous" error (conflict comes from the builtin
hasQualifier) and I cannot work around this error with any number of "decl(...)"
or "declaratorDecl(...)" or "nestedNameSpecifier(...)"... :-/

+    clang::ast_matchers::internal::Matcher<clang::NestedNameSpecifier>,
+    InnerMatcher) {
+  clang::NestedNameSpecifier* qual = Node.getQualifier();
+  return qual && InnerMatcher.matches(*qual, Finder, Builder);
+}
+
 // Matches |const Class<T>&| QualType if InnerMatcher matches |Class<T>|.
 AST_MATCHER_P(clang::QualType,
               hasUnderlyingType,
               clang::ast_matchers::internal::Matcher<clang::Type>,
               InnerMatcher) {
   const clang::Type* type = Node.getTypePtrOrNull();
   return type && InnerMatcher.matches(*type, Finder, Builder);
 }
 
 bool IsMethodOverrideOf(const clang::CXXMethodDecl& decl,
@@ skipping 605 matching lines @@
   llvm::InitializeNativeTargetAsmParser();
   llvm::cl::OptionCategory category(
       "rewrite_to_chrome_style: convert Blink style to Chrome style.");
   CommonOptionsParser options(argc, argv, category);
   clang::tooling::ClangTool tool(options.getCompilations(),
                                  options.getSourcePathList());
 
   MatchFinder match_finder;
   std::set<Replacement> replacements;
 
-  auto in_blink_namespace =
-      decl(hasAncestor(namespaceDecl(anyOf(hasName("blink"), hasName("WTF")),
-                                     hasParent(translationUnitDecl()))),
-           unless(isExpansionInFileMatching(kGeneratedFileRegex)));
+  auto blink_namespace_decl_matcher =
+      namespaceDecl(anyOf(hasName("blink"), hasName("WTF")),
+                    hasParent(translationUnitDecl()));
+  auto in_blink_namespace = decl(
+      anyOf(decl(hasAncestor(blink_namespace_decl_matcher)),
+            declaratorDecl(declaratorDeclHasQualifier(anyOf(
+                specifiesNamespace(blink_namespace_decl_matcher),
+                hasPrefix(specifiesNamespace(blink_namespace_decl_matcher)))))),
+      unless(isExpansionInFileMatching(kGeneratedFileRegex)));
 
   // Field, variable, and enum declarations ========
   // Given
   //   int x;
   //   struct S {
   //     int y;
   //     enum { VALUE };
   //   };
   // matches |x|, |y|, and |VALUE|.
   auto field_decl_matcher = id("decl", fieldDecl(in_blink_namespace));
@@ skipping 352 matching lines @@
   for (const auto& r : replacements) {
     std::string replacement_text = r.getReplacementText().str();
     std::replace(replacement_text.begin(), replacement_text.end(), '\n', '\0');
     llvm::outs() << "r:::" << r.getFilePath() << ":::" << r.getOffset()
                  << ":::" << r.getLength() << ":::" << replacement_text << "\n";
   }
   llvm::outs() << "==== END EDITS ====\n";
 
   return 0;
 }