cpp11-migrate: Refactor how global options are passed to Transforms

Refactored how global options are passed to Transforms to avoid widespread
changes every time a new global option is added.

Tests updated to reflect new interface.

llvm-svn: 183443

2 files changed, 17 insertions, 13 deletions

diff --git a/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp
index 8c362fd1a73..21f296068fe 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp
+++ b/clang-tools-extra/unittests/cpp11-migrate/PerfSupportTest.cpp
@@ -6,10 +6,10 @@ using namespace clang;
 

 class TransformA : public Transform {

 public:

-  TransformA()

-      : Transform("TransformA", false) {}

+  TransformA(const TransformOptions &Options)

+      : Transform("TransformA", Options) {}

 

-  virtual int apply(const FileContentsByPath &, RiskLevel,

+  virtual int apply(const FileContentsByPath &,

                     const tooling::CompilationDatabase &,

                     const std::vector<std::string> &, FileContentsByPath &) {

     return 0;

@@ -22,10 +22,10 @@ public:
 

 class TransformB : public Transform {

 public:

-  TransformB()

-      : Transform("TransformB", false) {}

+  TransformB(const TransformOptions &Options)

+      : Transform("TransformB", Options) {}

 

-  virtual int apply(const FileContentsByPath &, RiskLevel,

+  virtual int apply(const FileContentsByPath &,

                     const tooling::CompilationDatabase &,

                     const std::vector<std::string> &, FileContentsByPath &) {

     return 0;

@@ -46,8 +46,9 @@ struct ExpectedResults {
 };

 

 TEST(PerfSupport, collectSourcePerfData) {

-  TransformA A;

-  TransformB B;

+  TransformOptions Options;

+  TransformA A(Options);

+  TransformB B(Options);

   

   // The actual durations don't matter. Below only their relative ordering is

   // tested to ensure times, labels, and sources all stay together properly.

diff --git a/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp b/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp
index 76e5e3a1f94..447feb4d969 100644
--- a/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp
+++ b/clang-tools-extra/unittests/cpp11-migrate/TransformTest.cpp
@@ -9,11 +9,10 @@ using namespace clang;
 
 class DummyTransform : public Transform {
 public:
-  DummyTransform(llvm::StringRef Name, bool EnableTiming)
-      : Transform(Name, EnableTiming) {}
+  DummyTransform(llvm::StringRef Name, const TransformOptions &Options)
+      : Transform(Name, Options) {}
 
   virtual int apply(const FileContentsByPath &,
-                    RiskLevel ,
                     const tooling::CompilationDatabase &,
                     const std::vector<std::string> &,
                     FileContentsByPath &) { return 0; }
@@ -30,7 +29,9 @@ public:
 };
 
 TEST(Transform, Interface) {
-  DummyTransform T("my_transform", /*EnableTiming=*/false);
+  TransformOptions Options;
+  DummyTransform T("my_transform", Options);
+
   ASSERT_EQ("my_transform", T.getName());
   ASSERT_EQ(0u, T.getAcceptedChanges());
   ASSERT_EQ(0u, T.getRejectedChanges());
@@ -87,7 +88,9 @@ struct ConsumerFactory {
 };
 
 TEST(Transform, Timings) {
-  DummyTransform T("timing_transform", /*EnableTiming=*/true);
+  TransformOptions Options;
+  Options.EnableTiming = true;
+  DummyTransform T("timing_transform", Options);
 
   // All the path stuff is to make the test work independently of OS.