diff options
Diffstat (limited to 'clang-tools-extra/cpp11-migrate/AddOverride')
6 files changed, 35 insertions, 38 deletions
diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp index aed90c00667..ee6679f28ea 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.cpp @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverride.cpp - add C++11 override -------*- C++ -*-===// +//===-- AddOverride/AddOverride.cpp - add C++11 override ------------------===// // // The LLVM Compiler Infrastructure // @@ -16,11 +16,8 @@ #include "AddOverride.h" #include "AddOverrideActions.h" #include "AddOverrideMatchers.h" + #include "clang/Frontend/CompilerInstance.h" -#include "clang/Frontend/FrontendActions.h" -#include "clang/Rewrite/Core/Rewriter.h" -#include "clang/Tooling/Refactoring.h" -#include "clang/Tooling/Tooling.h" using clang::ast_matchers::MatchFinder; using namespace clang::tooling; @@ -36,11 +33,8 @@ int AddOverrideTransform::apply(FileOverrides &InputStates, const CompilationDatabase &Database, const std::vector<std::string> &SourcePaths) { ClangTool AddOverrideTool(Database, SourcePaths); - unsigned AcceptedChanges = 0; - MatchFinder Finder; - AddOverrideFixer Fixer(getReplacements(), AcceptedChanges, DetectMacros, /*Owner=*/ *this); Finder.addMatcher(makeCandidateForOverrideAttrMatcher(), &Fixer); @@ -56,7 +50,6 @@ int AddOverrideTransform::apply(FileOverrides &InputStates, } setAcceptedChanges(AcceptedChanges); - return 0; } diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h index 6448d3a98e4..81ceaed859c 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverride.h @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverride.h - add C++11 override ---------*- C++ -*-===// +//===-- AddOverride/AddOverride.h - add C++11 override ----------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -9,13 +9,14 @@ /// /// \file /// \brief This file provides the definition of the AddOverrideTransform -/// class which is the main interface to the transform that tries to add -/// the override keyword to declarations of member function that override -/// virtual functions in a base class. +/// class which is the main interface to the transform that tries to add the +/// override keyword to declarations of member function that override virtual +/// functions in a base class. /// //===----------------------------------------------------------------------===// -#ifndef LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_H -#define LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_H + +#ifndef CPP11_MIGRATE_ADD_OVERRIDE_H +#define CPP11_MIGRATE_ADD_OVERRIDE_H #include "Core/Transform.h" #include "llvm/Support/Compiler.h" @@ -41,4 +42,4 @@ private: AddOverrideFixer *Fixer; }; -#endif // LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_H +#endif // CPP11_MIGRATE_ADD_OVERRIDE_H diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp index 6407b86b9db..47c070e55ae 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.cpp @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverrideActions.cpp - add C++11 override-*- C++ -*-===// +//===-- AddOverride/AddOverrideActions.cpp - add C++11 override -----------===// // // The LLVM Compiler Infrastructure // @@ -7,9 +7,9 @@ // //===----------------------------------------------------------------------===// /// -/// \file -/// \brief This file contains the definition of the AddOverrideFixer class -/// which is used as an ASTMatcher callback. +/// \file +/// \brief This file contains the definition of the AddOverrideFixer class +/// which is used as an ASTMatcher callback. /// //===----------------------------------------------------------------------===// diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h index 1d125ebb7e1..54877d538a4 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideActions.h @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverrideActions.h - add C++11 override --*- C++ -*-===// +//===-- AddOverride/AddOverrideActions.h - add C++11 override ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,13 +7,14 @@ // //===----------------------------------------------------------------------===// /// -/// \file -/// \brief This file contains the declaration of the AddOverrideFixer class -/// which is used as a ASTMatcher callback. +/// \file +/// \brief This file contains the declaration of the AddOverrideFixer class +/// which is used as a ASTMatcher callback. /// //===----------------------------------------------------------------------===// -#ifndef LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H -#define LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H + +#ifndef CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H +#define CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Tooling/Refactoring.h" @@ -43,4 +44,4 @@ private: const Transform &Owner; }; -#endif // LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H +#endif // CPP11_MIGRATE_ADD_OVERRIDE_ACTIONS_H diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp index 1e27002f852..e323b5d5726 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.cpp @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverrideMatchers.cpp - C++11 override ---*- C++ -*-===// +//===-- AddOverride/AddOverrideMatchers.cpp - C++11 override --------------===// // // The LLVM Compiler Infrastructure // @@ -7,11 +7,12 @@ // //===----------------------------------------------------------------------===// /// -/// \file -/// \brief This file contains the definitions for matcher-generating functions -/// and a custom AST_MATCHER for identifying casts of type CK_NullTo*. +/// \file +/// \brief This file contains the definitions for matcher-generating functions +/// and a custom AST_MATCHER for identifying casts of type CK_NullTo*. /// //===----------------------------------------------------------------------===// + #include "AddOverrideMatchers.h" #include "clang/AST/ASTContext.h" diff --git a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h index 995919135f3..0a81e546e85 100644 --- a/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h +++ b/clang-tools-extra/cpp11-migrate/AddOverride/AddOverrideMatchers.h @@ -1,4 +1,4 @@ -//===-- AddOverride/AddOverrideMatchers.h - add C++11 override -*- C++ -*-===// +//===-- AddOverride/AddOverrideMatchers.h - add C++11 override --*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,13 +7,14 @@ // //===----------------------------------------------------------------------===// /// -/// \file -/// \brief This file contains the declarations for matcher-generating functions -/// and names for bound nodes found by AST matchers. +/// \file +/// \brief This file contains the declarations for matcher-generating functions +/// and names for bound nodes found by AST matchers. /// //===----------------------------------------------------------------------===// -#ifndef LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H -#define LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H + +#ifndef CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H +#define CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H #include "clang/ASTMatchers/ASTMatchers.h" @@ -24,4 +25,4 @@ extern const char *MethodId; /// candidates for adding the override attribute. clang::ast_matchers::DeclarationMatcher makeCandidateForOverrideAttrMatcher(); -#endif // LLVM_TOOLS_CLANG_TOOLS_EXTRA_CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H +#endif // CPP11_MIGRATE_ADD_OVERRIDE_MATCHERS_H |
