[clang-move] Matching static class member more correctly.

[ioeric]

lg

clang-tools-extra/trunk/clang-move/ClangMove.cpp

 #include "llvm/Support/Path.h"
 
 using namespace clang::ast_matchers;
 
 namespace clang {
 namespace move {
 namespace {
 
+// FIXME: Move to ASTMatchers.
+AST_MATCHER(VarDecl, isStaticDataMember) {
+  return Node.isStaticDataMember();
+}
+
 AST_MATCHER_P(Decl, hasOutermostEnclosingClass,
               ast_matchers::internal::Matcher<Decl>, InnerMatcher) {
   const auto* Context = Node.getDeclContext();
   if (!Context) return false;
   while (const auto *NextContext = Context->getParent()) {
     if (isa<NamespaceDecl>(NextContext) ||
         isa<TranslationUnitDecl>(NextContext))
       break;
void ClangMoveTool::registerMatchers(ast_matchers::MatchFinder *Finder) {
   // outside moved class declaration.
   Finder->addMatcher(
       cxxMethodDecl(InOldFiles, ofOutermostEnclosingClass(*InMovedClassNames),
                     isDefinition())
           .bind("class_method"),
       this);
 
   // Match static member variable definition of the moved class.
-  Finder->addMatcher(varDecl(InMovedClass, InOldCC, isDefinition())
+  Finder->addMatcher(varDecl(InMovedClass, InOldCC, isDefinition(),
+                             isStaticDataMember())
                          .bind("class_static_var_decl"),
                      this);
 
   auto inAnonymousNamespace = hasParent(namespaceDecl(isAnonymous()));
   // Match functions/variables definitions which are defined in anonymous
   // namespace in old cc.
   Finder->addMatcher(
       namedDecl(anyOf(functionDecl(isDefinition()), varDecl(isDefinition())),

clang-tools-extra/trunk/test/clang-move/Inputs/test.h

 namespace a {
 class Foo {
 public:
   int f();
+  int f2(int a, int b);
 };
 } // namespace a

clang-tools-extra/trunk/test/clang-move/Inputs/test.cpp

 #include "test.h"
 #include "test2.h"
 
 namespace a {
 int Foo::f() {
   return 0;
 }
+int Foo::f2(int a, int b) {
+  return a + b;
+}
 } // namespace a

clang-tools-extra/trunk/test/clang-move/move-class.cpp

 // RUN: FileCheck -input-file=%T/clang-move/new_test.h -check-prefix=CHECK-NEW-TEST-H %s
 // RUN: FileCheck -input-file=%T/clang-move/src/test.cpp -check-prefix=CHECK-OLD-TEST-CPP %s
 // RUN: FileCheck -input-file=%T/clang-move/include/test.h %s -implicit-check-not='{{namespace.*}}'
 //
 // CHECK-NEW-TEST-H: namespace a {
 // CHECK-NEW-TEST-H: class Foo {
 // CHECK-NEW-TEST-H: public:
 // CHECK-NEW-TEST-H:   int f();
+// CHECK-NEW-TEST-H:   int f2(int a, int b);
 // CHECK-NEW-TEST-H: };
 // CHECK-NEW-TEST-H: } // namespace a
 //
 // CHECK-NEW-TEST-CPP: #include "{{.*}}new_test.h"
 // CHECK-NEW-TEST-CPP: #include "test2.h"
 // CHECK-NEW-TEST-CPP: namespace a {
 // CHECK-NEW-TEST-CPP: int Foo::f() { return 0; }
+// CHECK-NEW-TEST-CPP: int Foo::f2(int a, int b) { return a + b; }
 // CHECK-NEW-TEST-CPP: } // namespace a
 //
 // CHECK-OLD-TEST-CPP: #include "test.h"
 // CHECK-OLD-TEST-CPP: #include "test2.h"