Hi klimek,
http://reviews.llvm.org/D5602
Files:
clang-tidy/ClangTidy.cpp
clang-tidy/ClangTidy.h
unittests/clang-tidy/ClangTidyOptionsTest.cpp
Index: clang-tidy/ClangTidy.cpp
===================================================================
--- clang-tidy/ClangTidy.cpp
+++ clang-tidy/ClangTidy.cpp
@@ -319,7 +319,7 @@
const ClangTidyOptions::OptionMap &CheckOptions)
: NamePrefix(CheckName.str() + "."), CheckOptions(CheckOptions) {}
-std::string OptionsView::get(StringRef LocalName, std::string Default) const {
+std::string OptionsView::get(StringRef LocalName, const char *Default) const {
const auto &Iter = CheckOptions.find(NamePrefix + LocalName.str());
if (Iter != CheckOptions.end())
return Iter->second;
@@ -336,6 +336,11 @@
store(Options, LocalName, llvm::itostr(Value));
}
+void OptionsView::store(ClangTidyOptions::OptionMap &Options,
+ StringRef LocalName, bool Value) const {
+ store(Options, LocalName, Value ? "true" : "false");
+}
+
std::vector<std::string> getCheckNames(const ClangTidyOptions &Options) {
clang::tidy::ClangTidyContext Context(
llvm::make_unique<DefaultOptionsProvider>(ClangTidyGlobalOptions(),
Index: clang-tidy/ClangTidy.h
===================================================================
--- clang-tidy/ClangTidy.h
+++ clang-tidy/ClangTidy.h
@@ -47,7 +47,7 @@
/// Reads the option with the check-local name \p LocalName from the
/// \c CheckOptions. If the corresponding key is not present, returns
/// \p Default.
- std::string get(StringRef LocalName, std::string Default) const;
+ std::string get(StringRef LocalName, const char *Default) const;
/// \brief Read a named option from the \c Context and parse it as an integral
/// type \c T.
@@ -65,6 +65,20 @@
return Result;
}
+ /// \brief Read a named option from the \c Context and parse it as bool.
+ ///
+ /// Reads the option with the check-local name \p LocalName from the
+ /// \c CheckOptions. If the corresponding key is not present, returns
+ /// \p Default.
+ bool get(StringRef LocalName, bool Default) const {
+ std::string Value = get(LocalName, "");
+ if (Value == "true")
+ return true;
+ if (Value == "false")
+ return false;
+ return Default;
+ }
+
/// \brief Stores an option with the check-local name \p LocalName with string
/// value \p Value to \p Options.
void store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
@@ -75,6 +89,20 @@
void store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
int64_t Value) const;
+ /// \brief Stores an option with the check-local name \p LocalName with
+ /// an integral value \p Value to \p Options.
+ template <typename T>
+ typename std::enable_if<std::is_integral<T>::value, void>::type
+ store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
+ T Value) const {
+ store(Options, LocalName, static_cast<int64_t>(Value));
+ }
+
+ /// \brief Stores an option with the check-local name \p LocalName with
+ /// a \c bool value \p Value to \p Options.
+ void store(ClangTidyOptions::OptionMap &Options, StringRef LocalName,
+ bool Value) const;
+
private:
std::string NamePrefix;
const ClangTidyOptions::OptionMap &CheckOptions;
Index: unittests/clang-tidy/ClangTidyOptionsTest.cpp
===================================================================
--- unittests/clang-tidy/ClangTidyOptionsTest.cpp
+++ unittests/clang-tidy/ClangTidyOptionsTest.cpp
@@ -1,3 +1,4 @@
+#include "ClangTidy.h"
#include "ClangTidyOptions.h"
#include "gtest/gtest.h"
@@ -54,7 +55,7 @@
EXPECT_EQ(1000u, Options.LineFilter[2].LineRanges[0].second);
}
-TEST(ParseConfiguration, ValidConfiguration) {
+TEST(ParseConfiguration, BaseConfiguration) {
llvm::ErrorOr<ClangTidyOptions> Options =
parseConfiguration("Checks: \"-*,misc-*\"\n"
"HeaderFilterRegex: \".*\"\n"
@@ -67,6 +68,33 @@
EXPECT_EQ("some.user", *Options->User);
}
+TEST(ParseConfiguration, CheckOptions) {
+ llvm::ErrorOr<ClangTidyOptions> Options =
+ parseConfiguration("CheckOptions:\n"
+ " - key: test-check.String\n"
+ " value: ' qwe !@#* '\n"
+ " - key: test-check.IntegerPositive\n"
+ " value: 12345\n"
+ " - key: test-check.IntegerNegative\n"
+ " value: -67890\n"
+ " - key: test-check.BooleanTrue\n"
+ " value: true\n"
+ " - key: test-check.BooleanFalse\n"
+ " value: false\n"
+ );
+ EXPECT_TRUE(!!Options);
+ OptionsView Opt("test-check", Options->CheckOptions);
+ EXPECT_EQ("qqq", Opt.get("NonExistent", "qqq"));
+ EXPECT_EQ(-123, Opt.get("NonExistent", -123));
+ EXPECT_EQ(123U, Opt.get("NonExistent", 123U));
+ EXPECT_EQ(" qwe !@#* ", Opt.get("String", ""));
+ EXPECT_EQ(12345, Opt.get("IntegerPositive", 0));
+ EXPECT_EQ(12345U, Opt.get("IntegerPositive", 0U));
+ EXPECT_EQ(-67890, Opt.get("IntegerNegative", 0));
+ EXPECT_TRUE(Opt.get("BooleanTrue", false));
+ EXPECT_FALSE(Opt.get("BooleanFalse", true));
+}
+
} // namespace test
} // namespace tidy
} // namespace clang
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
