From 5b982e539d5c50ddd1d407e60e9b8051502c4a37 Mon Sep 17 00:00:00 2001 From: Alexander Kornienko Date: Mon, 9 Mar 2015 11:48:54 +0000 Subject: [PATCH] [clang-tidy] Refactor: Rename clang-tidy misc check files and classes to follow naming conventions Classes are named WhateverCheck, files are named WhateverCheck.cpp and WhateverCheck.h. http://reviews.llvm.org/D8145 Patch by Richard Thomson! llvm-svn: 231648 --- ...nversion.cpp => BoolPointerImplicitConversionCheck.cpp} | 10 +++++----- ...itConversion.h => BoolPointerImplicitConversionCheck.h} | 12 ++++++------ clang-tools-extra/clang-tidy/misc/CMakeLists.txt | 8 ++++---- clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp | 14 +++++++------- ...eptrResetRelease.cpp => UniqueptrResetReleaseCheck.cpp} | 8 ++++---- ...niqueptrResetRelease.h => UniqueptrResetReleaseCheck.h} | 12 ++++++------ .../misc/{UnusedRAII.cpp => UnusedRAIICheck.cpp} | 4 ++-- .../clang-tidy/misc/{UnusedRAII.h => UnusedRAIICheck.h} | 8 ++++---- .../misc/{UseOverride.cpp => UseOverrideCheck.cpp} | 8 ++++---- .../clang-tidy/misc/{UseOverride.h => UseOverrideCheck.h} | 12 ++++++------ 10 files changed, 48 insertions(+), 48 deletions(-) rename clang-tools-extra/clang-tidy/misc/{BoolPointerImplicitConversion.cpp => BoolPointerImplicitConversionCheck.cpp} (90%) rename clang-tools-extra/clang-tidy/misc/{BoolPointerImplicitConversion.h => BoolPointerImplicitConversionCheck.h} (77%) rename clang-tools-extra/clang-tidy/misc/{UniqueptrResetRelease.cpp => UniqueptrResetReleaseCheck.cpp} (90%) rename clang-tools-extra/clang-tidy/misc/{UniqueptrResetRelease.h => UniqueptrResetReleaseCheck.h} (81%) rename clang-tools-extra/clang-tidy/misc/{UnusedRAII.cpp => UnusedRAIICheck.cpp} (96%) rename clang-tools-extra/clang-tidy/misc/{UnusedRAII.h => UnusedRAIICheck.h} (84%) rename clang-tools-extra/clang-tidy/misc/{UseOverride.cpp => UseOverrideCheck.cpp} (96%) rename clang-tools-extra/clang-tidy/misc/{UseOverride.h => UseOverrideCheck.h} (64%) diff --git a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp similarity index 90% rename from clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp rename to clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp index b243ddb..01313c1 100644 --- a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.cpp +++ b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.cpp @@ -1,4 +1,4 @@ -//===--- BoolPointerImplicitConversion.cpp - clang-tidy -------------------===// +//===--- BoolPointerImplicitConversionCheck.cpp - clang-tidy --------------===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "BoolPointerImplicitConversion.h" +#include "BoolPointerImplicitConversionCheck.h" using namespace clang::ast_matchers; @@ -24,7 +24,7 @@ AST_MATCHER(QualType, isBoolean) { return Node->isBooleanType(); } namespace tidy { namespace misc { -void BoolPointerImplicitConversion::registerMatchers(MatchFinder *Finder) { +void BoolPointerImplicitConversionCheck::registerMatchers(MatchFinder *Finder) { // Look for ifs that have an implicit bool* to bool conversion in the // condition. Filter negations. Finder->addMatcher( @@ -38,8 +38,8 @@ void BoolPointerImplicitConversion::registerMatchers(MatchFinder *Finder) { this); } -void -BoolPointerImplicitConversion::check(const MatchFinder::MatchResult &Result) { +void BoolPointerImplicitConversionCheck::check( + const MatchFinder::MatchResult &Result) { auto *If = Result.Nodes.getStmtAs("if"); auto *Var = Result.Nodes.getStmtAs("expr"); diff --git a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.h b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.h similarity index 77% rename from clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.h rename to clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.h index 915ebc4..58c939d 100644 --- a/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversion.h +++ b/clang-tools-extra/clang-tidy/misc/BoolPointerImplicitConversionCheck.h @@ -1,4 +1,4 @@ -//===--- BoolPointerImplicitConversion.h - clang-tidy -----------*- C++ -*-===// +//===--- BoolPointerImplicitConversionCheck.h - clang-tidy ------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONV_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONV_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONVERSION_CHECK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONVERSION_CHECK_H #include "../ClangTidy.h" @@ -22,9 +22,9 @@ namespace misc { /// if (p) { /// // Never used in a pointer-specific way. /// } -class BoolPointerImplicitConversion : public ClangTidyCheck { +class BoolPointerImplicitConversionCheck : public ClangTidyCheck { public: - BoolPointerImplicitConversion(StringRef Name, ClangTidyContext *Context) + BoolPointerImplicitConversionCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; @@ -34,5 +34,5 @@ public: } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONV_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_BOOL_POINTER_IMPLICIT_CONVERSION_CHECK_H diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt index 2664bba..42b711f 100644 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt @@ -4,16 +4,16 @@ add_clang_library(clangTidyMiscModule ArgumentCommentCheck.cpp AssertSideEffectCheck.cpp AssignOperatorSignatureCheck.cpp - BoolPointerImplicitConversion.cpp + BoolPointerImplicitConversionCheck.cpp InaccurateEraseCheck.cpp InefficientAlgorithmCheck.cpp MiscTidyModule.cpp StaticAssertCheck.cpp SwappedArgumentsCheck.cpp UndelegatedConstructor.cpp - UnusedRAII.cpp - UniqueptrResetRelease.cpp - UseOverride.cpp + UnusedRAIICheck.cpp + UniqueptrResetReleaseCheck.cpp + UseOverrideCheck.cpp LINK_LIBS clangAST diff --git a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp index d5f3841..76585e0 100644 --- a/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp +++ b/clang-tools-extra/clang-tidy/misc/MiscTidyModule.cpp @@ -13,15 +13,15 @@ #include "ArgumentCommentCheck.h" #include "AssertSideEffectCheck.h" #include "AssignOperatorSignatureCheck.h" -#include "BoolPointerImplicitConversion.h" +#include "BoolPointerImplicitConversionCheck.h" #include "InaccurateEraseCheck.h" #include "InefficientAlgorithmCheck.h" #include "StaticAssertCheck.h" #include "SwappedArgumentsCheck.h" #include "UndelegatedConstructor.h" -#include "UniqueptrResetRelease.h" -#include "UnusedRAII.h" -#include "UseOverride.h" +#include "UniqueptrResetReleaseCheck.h" +#include "UnusedRAIICheck.h" +#include "UseOverrideCheck.h" namespace clang { namespace tidy { @@ -35,7 +35,7 @@ public: "misc-assert-side-effect"); CheckFactories.registerCheck( "misc-assign-operator-signature"); - CheckFactories.registerCheck( + CheckFactories.registerCheck( "misc-bool-pointer-implicit-conversion"); CheckFactories.registerCheck( "misc-inaccurate-erase"); @@ -47,10 +47,10 @@ public: "misc-swapped-arguments"); CheckFactories.registerCheck( "misc-undelegated-constructor"); - CheckFactories.registerCheck( + CheckFactories.registerCheck( "misc-uniqueptr-reset-release"); CheckFactories.registerCheck("misc-unused-raii"); - CheckFactories.registerCheck("misc-use-override"); + CheckFactories.registerCheck("misc-use-override"); } }; diff --git a/clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.cpp b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp similarity index 90% rename from clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.cpp rename to clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp index 3f3a68c..d7ba7e7 100644 --- a/clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.cpp +++ b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.cpp @@ -1,4 +1,4 @@ -//===--- UniqueptrResetRelease.cpp - clang-tidy ---------------------------===// +//===--- UniqueptrResetReleaseCheck.cpp - clang-tidy ----------------------===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "UniqueptrResetRelease.h" +#include "UniqueptrResetReleaseCheck.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Lex/Lexer.h" @@ -17,7 +17,7 @@ namespace clang { namespace tidy { namespace misc { -void UniqueptrResetRelease::registerMatchers(MatchFinder *Finder) { +void UniqueptrResetReleaseCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher( memberCallExpr( on(expr().bind("left")), callee(memberExpr().bind("reset_member")), @@ -32,7 +32,7 @@ void UniqueptrResetRelease::registerMatchers(MatchFinder *Finder) { this); } -void UniqueptrResetRelease::check(const MatchFinder::MatchResult &Result) { +void UniqueptrResetReleaseCheck::check(const MatchFinder::MatchResult &Result) { const auto *ResetMember = Result.Nodes.getNodeAs("reset_member"); const auto *ReleaseMember = Result.Nodes.getNodeAs("release_member"); diff --git a/clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.h b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h similarity index 81% rename from clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.h rename to clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h index df74159..2dbdb0c 100644 --- a/clang-tools-extra/clang-tidy/misc/UniqueptrResetRelease.h +++ b/clang-tools-extra/clang-tidy/misc/UniqueptrResetReleaseCheck.h @@ -1,4 +1,4 @@ -//===--- UniqueptrResetRelease.h - clang-tidy -------------------*- C++ -*-===// +//===--- UniqueptrResetReleaseCheck.h - clang-tidy --------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_CHECK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_CHECK_H #include "../ClangTidy.h" @@ -24,9 +24,9 @@ namespace misc { /// /// If "y" is already rvalue, std::move is not added. /// "x" and "y" can also be std::unique_ptr*. -class UniqueptrResetRelease : public ClangTidyCheck { +class UniqueptrResetReleaseCheck : public ClangTidyCheck { public: - UniqueptrResetRelease(StringRef Name, ClangTidyContext *Context) + UniqueptrResetReleaseCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; @@ -37,4 +37,4 @@ public: } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNIQUEPTR_RESET_RELEASE_CHECK_H diff --git a/clang-tools-extra/clang-tidy/misc/UnusedRAII.cpp b/clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.cpp similarity index 96% rename from clang-tools-extra/clang-tidy/misc/UnusedRAII.cpp rename to clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.cpp index c993ab3..9a7628b 100644 --- a/clang-tools-extra/clang-tidy/misc/UnusedRAII.cpp +++ b/clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.cpp @@ -1,4 +1,4 @@ -//===--- UnusedRAII.cpp - clang-tidy ---------------------------===// +//===--- UnusedRAIICheck.cpp - clang-tidy ---------------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "UnusedRAII.h" +#include "UnusedRAIICheck.h" #include "clang/AST/ASTContext.h" #include "clang/Lex/Lexer.h" diff --git a/clang-tools-extra/clang-tidy/misc/UnusedRAII.h b/clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.h similarity index 84% rename from clang-tools-extra/clang-tidy/misc/UnusedRAII.h rename to clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.h index 04783cf..f12c07f 100644 --- a/clang-tools-extra/clang-tidy/misc/UnusedRAII.h +++ b/clang-tools-extra/clang-tidy/misc/UnusedRAIICheck.h @@ -1,4 +1,4 @@ -//===--- UnusedRAII.h - clang-tidy ------------------------------*- C++ -*-===// +//===--- UnusedRAIICheck.h - clang-tidy -------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_CHECK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_CHECK_H #include "../ClangTidy.h" @@ -48,4 +48,4 @@ public: } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_UNUSED_RAII_CHECK_H diff --git a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp b/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp similarity index 96% rename from clang-tools-extra/clang-tidy/misc/UseOverride.cpp rename to clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp index 9e438a2..28b20e0 100644 --- a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp +++ b/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.cpp @@ -1,4 +1,4 @@ -//===--- UseOverride.cpp - clang-tidy -------------------------------------===// +//===--- UseOverrideCheck.cpp - clang-tidy --------------------------------===// // // The LLVM Compiler Infrastructure // @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "UseOverride.h" +#include "UseOverrideCheck.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" #include "clang/Lex/Lexer.h" @@ -18,7 +18,7 @@ namespace clang { namespace tidy { namespace misc { -void UseOverride::registerMatchers(MatchFinder *Finder) { +void UseOverrideCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher(methodDecl(isOverride()).bind("method"), this); } @@ -57,7 +57,7 @@ static StringRef GetText(const Token &Tok, const SourceManager &Sources) { Tok.getLength()); } -void UseOverride::check(const MatchFinder::MatchResult &Result) { +void UseOverrideCheck::check(const MatchFinder::MatchResult &Result) { if (!Result.Context->getLangOpts().CPlusPlus11) return; diff --git a/clang-tools-extra/clang-tidy/misc/UseOverride.h b/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h similarity index 64% rename from clang-tools-extra/clang-tidy/misc/UseOverride.h rename to clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h index 839c7fe..e446644 100644 --- a/clang-tools-extra/clang-tidy/misc/UseOverride.h +++ b/clang-tools-extra/clang-tidy/misc/UseOverrideCheck.h @@ -1,4 +1,4 @@ -//===--- UseOverride.h - clang-tidy -----------------------------*- C++ -*-===// +//===--- UseOverrideCheck.h - clang-tidy ------------------------*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_H -#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_H +#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_CHECK_H +#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_CHECK_H #include "../ClangTidy.h" @@ -17,9 +17,9 @@ namespace tidy { namespace misc { /// \brief Use C++11's 'override' and remove 'virtual' where applicable. -class UseOverride : public ClangTidyCheck { +class UseOverrideCheck : public ClangTidyCheck { public: - UseOverride(StringRef Name, ClangTidyContext *Context) + UseOverrideCheck(StringRef Name, ClangTidyContext *Context) : ClangTidyCheck(Name, Context) {} void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; @@ -29,4 +29,4 @@ public: } // namespace tidy } // namespace clang -#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_H +#endif // LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_MISC_USE_OVERRIDE_CHECK_H -- 2.7.4