Author: Nathan James Date: 2020-07-28T14:52:43+01:00 New Revision: 7bae3188e08746566733148a4ceccdb3cf24e93b
URL: https://github.com/llvm/llvm-project/commit/7bae3188e08746566733148a4ceccdb3cf24e93b DIFF: https://github.com/llvm/llvm-project/commit/7bae3188e08746566733148a4ceccdb3cf24e93b.diff LOG: [clang-tidy][NFC] Make OptionsView methods as const where missing Added: Modified: clang-tools-extra/clang-tidy/ClangTidyCheck.cpp clang-tools-extra/clang-tidy/ClangTidyCheck.h Removed: ################################################################################ diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp index c24b8553999c..ffd5bf974ba2 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp +++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.cpp @@ -168,10 +168,9 @@ void ClangTidyCheck::OptionsView::store<bool>( store(Options, LocalName, Value ? StringRef("true") : StringRef("false")); } -llvm::Expected<int64_t> -ClangTidyCheck::OptionsView::getEnumInt(StringRef LocalName, - ArrayRef<NameAndValue> Mapping, - bool CheckGlobal, bool IgnoreCase) { +llvm::Expected<int64_t> ClangTidyCheck::OptionsView::getEnumInt( + StringRef LocalName, ArrayRef<NameAndValue> Mapping, bool CheckGlobal, + bool IgnoreCase) const { auto Iter = CheckGlobal ? findPriorityOption(CheckOptions, NamePrefix, LocalName) : CheckOptions.find((NamePrefix + LocalName).str()); diff --git a/clang-tools-extra/clang-tidy/ClangTidyCheck.h b/clang-tools-extra/clang-tidy/ClangTidyCheck.h index 54b725126752..4df8071c841e 100644 --- a/clang-tools-extra/clang-tidy/ClangTidyCheck.h +++ b/clang-tools-extra/clang-tidy/ClangTidyCheck.h @@ -330,7 +330,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { /// supply the mapping required to convert between ``T`` and a string. template <typename T> std::enable_if_t<std::is_enum<T>::value, llvm::Expected<T>> - get(StringRef LocalName, bool IgnoreCase = false) { + get(StringRef LocalName, bool IgnoreCase = false) const { if (llvm::Expected<int64_t> ValueOr = getEnumInt(LocalName, typeEraseMapping<T>(), false, IgnoreCase)) return static_cast<T>(*ValueOr); @@ -349,7 +349,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { /// supply the mapping required to convert between ``T`` and a string. template <typename T> std::enable_if_t<std::is_enum<T>::value, T> - get(StringRef LocalName, T Default, bool IgnoreCase = false) { + get(StringRef LocalName, T Default, bool IgnoreCase = false) const { if (auto ValueOr = get<T>(LocalName, IgnoreCase)) return *ValueOr; else @@ -370,8 +370,7 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { /// supply the mapping required to convert between ``T`` and a string. template <typename T> std::enable_if_t<std::is_enum<T>::value, llvm::Expected<T>> - getLocalOrGlobal(StringRef LocalName, - bool IgnoreCase = false) { + getLocalOrGlobal(StringRef LocalName, bool IgnoreCase = false) const { if (llvm::Expected<int64_t> ValueOr = getEnumInt(LocalName, typeEraseMapping<T>(), true, IgnoreCase)) return static_cast<T>(*ValueOr); @@ -391,7 +390,8 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { /// supply the mapping required to convert between ``T`` and a string. template <typename T> std::enable_if_t<std::is_enum<T>::value, T> - getLocalOrGlobal(StringRef LocalName, T Default, bool IgnoreCase = false) { + getLocalOrGlobal(StringRef LocalName, T Default, + bool IgnoreCase = false) const { if (auto ValueOr = getLocalOrGlobal<T>(LocalName, IgnoreCase)) return *ValueOr; else @@ -420,7 +420,8 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { /// supply the mapping required to convert between ``T`` and a string. template <typename T> std::enable_if_t<std::is_enum<T>::value> - store(ClangTidyOptions::OptionMap &Options, StringRef LocalName, T Value) { + store(ClangTidyOptions::OptionMap &Options, StringRef LocalName, + T Value) const { ArrayRef<std::pair<T, StringRef>> Mapping = OptionEnumMapping<T>::getEnumMapping(); auto Iter = llvm::find_if( @@ -436,11 +437,11 @@ class ClangTidyCheck : public ast_matchers::MatchFinder::MatchCallback { llvm::Expected<int64_t> getEnumInt(StringRef LocalName, ArrayRef<NameAndValue> Mapping, - bool CheckGlobal, bool IgnoreCase); + bool CheckGlobal, bool IgnoreCase) const; template <typename T> std::enable_if_t<std::is_enum<T>::value, std::vector<NameAndValue>> - typeEraseMapping() { + typeEraseMapping() const { ArrayRef<std::pair<T, StringRef>> Mapping = OptionEnumMapping<T>::getEnumMapping(); std::vector<NameAndValue> Result; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
