diff options
| author | Haojian Wu <hokein@google.com> | 2016-10-13 10:31:00 +0000 |
|---|---|---|
| committer | Haojian Wu <hokein@google.com> | 2016-10-13 10:31:00 +0000 |
| commit | e77bcc7371c1d3054a99ee45eeac45ca335dd2d9 (patch) | |
| tree | 8ae48d39e6d4d32ab0ba31796fb0debd25c30b79 /clang-tools-extra/test/clang-move/move-multiple-classes.cpp | |
| parent | 2f5ed342797d78e1544338de09186c54d027144e (diff) | |
| download | bcm5719-llvm-e77bcc7371c1d3054a99ee45eeac45ca335dd2d9.tar.gz bcm5719-llvm-e77bcc7371c1d3054a99ee45eeac45ca335dd2d9.zip | |
[clang-move] Better support enclosing class.
Summary:
* When moving an outermost enclosing class, all its nested classes should also
be moved together.
* Add a test for not moving nested class.
Reviewers: ioeric
Subscribers: cfe-commits
Differential Revision: https://reviews.llvm.org/D25369
llvm-svn: 284111
Diffstat (limited to 'clang-tools-extra/test/clang-move/move-multiple-classes.cpp')
| -rw-r--r-- | clang-tools-extra/test/clang-move/move-multiple-classes.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/clang-tools-extra/test/clang-move/move-multiple-classes.cpp b/clang-tools-extra/test/clang-move/move-multiple-classes.cpp index 4e8cf4be733..e9a72364a05 100644 --- a/clang-tools-extra/test/clang-move/move-multiple-classes.cpp +++ b/clang-tools-extra/test/clang-move/move-multiple-classes.cpp @@ -1,12 +1,15 @@ // RUN: mkdir -p %T/move-multiple-classes // RUN: cp %S/Inputs/multiple_class_test* %T/move-multiple-classes/ // RUN: cd %T/move-multiple-classes -// RUN: clang-move -names="a::Move1, b::Move2,c::Move3,c::Move4" -new_cc=%T/move-multiple-classes/new_multiple_class_test.cpp -new_header=%T/move-multiple-classes/new_multiple_class_test.h -old_cc=%T/move-multiple-classes/multiple_class_test.cpp -old_header=../move-multiple-classes/multiple_class_test.h %T/move-multiple-classes/multiple_class_test.cpp -- +// RUN: clang-move -names="c::EnclosingMove5::Nested" -new_cc=%T/move-multiple-classes/new_multiple_class_test.cpp -new_header=%T/move-multiple-classes/new_multiple_class_test.h -old_cc=%T/move-multiple-classes/multiple_class_test.cpp -old_header=../move-multiple-classes/multiple_class_test.h -dump_result %T/move-multiple-classes/multiple_class_test.cpp -- | FileCheck %s -check-prefix=CHECK-EMPTY +// RUN: clang-move -names="a::Move1, b::Move2,c::Move3,c::Move4,c::EnclosingMove5" -new_cc=%T/move-multiple-classes/new_multiple_class_test.cpp -new_header=%T/move-multiple-classes/new_multiple_class_test.h -old_cc=%T/move-multiple-classes/multiple_class_test.cpp -old_header=../move-multiple-classes/multiple_class_test.h %T/move-multiple-classes/multiple_class_test.cpp -- // RUN: FileCheck -input-file=%T/move-multiple-classes/new_multiple_class_test.cpp -check-prefix=CHECK-NEW-TEST-CPP %s // RUN: FileCheck -input-file=%T/move-multiple-classes/new_multiple_class_test.h -check-prefix=CHECK-NEW-TEST-H %s // RUN: FileCheck -input-file=%T/move-multiple-classes/multiple_class_test.cpp -check-prefix=CHECK-OLD-TEST-CPP %s // RUN: FileCheck -input-file=%T/move-multiple-classes/multiple_class_test.h -check-prefix=CHECK-OLD-TEST-H %s // +// CHECK-EMPTY: [{{[[:space:]]*}}] +// // CHECK-OLD-TEST-H: namespace c { // CHECK-OLD-TEST-H: class NoMove { // CHECK-OLD-TEST-H: public: @@ -42,6 +45,14 @@ // CHECK-NEW-TEST-H: public: // CHECK-NEW-TEST-H: int f(); // CHECK-NEW-TEST-H: }; +// CHECK-NEW-TEST-H: class EnclosingMove5 { +// CHECK-NEW-TEST-H: public: +// CHECK-NEW-TEST-H: class Nested { +// CHECK-NEW-TEST-H: int f(); +// CHECK-NEW-TEST-H: static int b; +// CHECK-NEW-TEST-H: }; +// CHECK-NEW-TEST-H: static int a; +// CHECK-NEW-TEST-H: }; // CHECK-NEW-TEST-H: } // namespace c // CHECK-NEW-TEST-CPP: #include "{{.*}}new_multiple_class_test.h" @@ -54,4 +65,7 @@ // CHECK-NEW-TEST-CPP: namespace c { // CHECK-NEW-TEST-CPP: int Move3::f() { return 0; } // CHECK-NEW-TEST-CPP: int Move4::f() { return 0; } +// CHECK-NEW-TEST-CPP: int EnclosingMove5::a = 1; +// CHECK-NEW-TEST-CPP: int EnclosingMove5::Nested::f() { return 0; } +// CHECK-NEW-TEST-CPP: int EnclosingMove5::Nested::b = 1; // CHECK-NEW-TEST-CPP: } // namespace c |
