Refactoring transform-specific options

    
Making the user null macros command-line option visible to the
UseNullptrTransform class instead of being visible only to the match callback.

llvm-svn: 192905

1 files changed, 4 insertions, 11 deletions

diff --git a/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
index 23a8fd3a476..1aca261a7f3 100644
--- a/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
+++ b/clang-tools-extra/clang-modernize/UseNullptr/NullptrActions.cpp
@@ -32,12 +32,6 @@ namespace {
 
 const char *NullMacroName = "NULL";
 
-static cl::opt<std::string>
-UserNullMacroNames("user-null-macros",
-                   cl::desc("Comma-separated list of user-defined "
-                            "macro names that behave like NULL"),
-                   cl::cat(TransformsOptionsCategory), cl::init(""));
-
 bool isReplaceableRange(SourceLocation StartLoc, SourceLocation EndLoc,
                         const SourceManager &SM, const Transform &Owner) {
   return SM.isWrittenInSameFile(StartLoc, EndLoc) &&
@@ -428,13 +422,12 @@ private:
 };
 } // namespace
 
-NullptrFixer::NullptrFixer(unsigned &AcceptedChanges, RiskLevel,
+NullptrFixer::NullptrFixer(unsigned &AcceptedChanges,
+                           llvm::ArrayRef<llvm::StringRef> UserMacros,
                            Transform &Owner)
     : AcceptedChanges(AcceptedChanges), Owner(Owner) {
-  if (!UserNullMacroNames.empty()) {
-    llvm::StringRef S = UserNullMacroNames;
-    S.split(UserNullMacros, ",");
-  }
+  UserNullMacros.insert(UserNullMacros.begin(), UserMacros.begin(),
+                        UserMacros.end());
   UserNullMacros.insert(UserNullMacros.begin(), llvm::StringRef(NullMacroName));
 }