Commit 4696bad1 authored by jamesr@chromium.org's avatar jamesr@chromium.org

Add cc/ to banned_directories in chromium clang style checker

The chromium compositor code will be imported from WebKit into this directory
soon. Since it's WebKit style, it doesn't currently adhere to all of the clang
style checks. This adds a temporary exemption so we don't spam the heck out of
everyone while we clean things up.

BUG=none
NOTRY=true

Review URL: https://chromiumcodereview.appspot.com/10853012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150013 0039d316-1c4b-4281-b951-d872f2087c98
parent 9f9bb414
...@@ -37,10 +37,12 @@ bool ends_with(const std::string& one, const std::string& two) { ...@@ -37,10 +37,12 @@ bool ends_with(const std::string& one, const std::string& two) {
} // namespace } // namespace
ChromeClassTester::ChromeClassTester(CompilerInstance& instance, ChromeClassTester::ChromeClassTester(CompilerInstance& instance,
bool check_inner_classes) bool check_inner_classes,
bool check_cc_directory)
: instance_(instance), : instance_(instance),
diagnostic_(instance.getDiagnostics()), diagnostic_(instance.getDiagnostics()),
check_inner_classes_(check_inner_classes) { check_inner_classes_(check_inner_classes),
check_cc_directory_(check_cc_directory) {
BuildBannedLists(); BuildBannedLists();
} }
...@@ -163,6 +165,9 @@ void ChromeClassTester::BuildBannedLists() { ...@@ -163,6 +165,9 @@ void ChromeClassTester::BuildBannedLists() {
banned_directories_.push_back("icu4c/"); banned_directories_.push_back("icu4c/");
banned_directories_.push_back("frameworks/"); banned_directories_.push_back("frameworks/");
if (!check_cc_directory_)
banned_directories_.push_back("cc/");
// Don't check autogenerated headers. // Don't check autogenerated headers.
// Make puts them below $(builddir_name)/.../gen and geni. // Make puts them below $(builddir_name)/.../gen and geni.
// Ninja puts them below OUTPUT_DIR/.../gen // Ninja puts them below OUTPUT_DIR/.../gen
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
class ChromeClassTester : public clang::ASTConsumer { class ChromeClassTester : public clang::ASTConsumer {
public: public:
explicit ChromeClassTester(clang::CompilerInstance& instance, explicit ChromeClassTester(clang::CompilerInstance& instance,
bool check_inner_classes); bool check_inner_classes,
bool check_cc_directory);
virtual ~ChromeClassTester(); virtual ~ChromeClassTester();
// clang::ASTConsumer: // clang::ASTConsumer:
...@@ -83,6 +84,9 @@ class ChromeClassTester : public clang::ASTConsumer { ...@@ -83,6 +84,9 @@ class ChromeClassTester : public clang::ASTConsumer {
// TODO: Remove once all inner classes are cleaned up. // TODO: Remove once all inner classes are cleaned up.
bool check_inner_classes_; bool check_inner_classes_;
// TODO(jamesr): Remove once cc/ directory compiles without warnings.
bool check_cc_directory_;
}; };
#endif // TOOLS_CLANG_PLUGINS_CHROMECLASSTESTER_H_ #endif // TOOLS_CLANG_PLUGINS_CHROMECLASSTESTER_H_
...@@ -51,8 +51,9 @@ class FindBadConstructsConsumer : public ChromeClassTester { ...@@ -51,8 +51,9 @@ class FindBadConstructsConsumer : public ChromeClassTester {
FindBadConstructsConsumer(CompilerInstance& instance, FindBadConstructsConsumer(CompilerInstance& instance,
bool check_refcounted_dtors, bool check_refcounted_dtors,
bool check_virtuals_in_implementations, bool check_virtuals_in_implementations,
bool check_inner_classes) bool check_inner_classes,
: ChromeClassTester(instance, check_inner_classes), bool check_cc_directory)
: ChromeClassTester(instance, check_inner_classes, check_cc_directory),
check_refcounted_dtors_(check_refcounted_dtors), check_refcounted_dtors_(check_refcounted_dtors),
check_virtuals_in_implementations_(check_virtuals_in_implementations) { check_virtuals_in_implementations_(check_virtuals_in_implementations) {
} }
...@@ -397,7 +398,8 @@ class FindBadConstructsAction : public PluginASTAction { ...@@ -397,7 +398,8 @@ class FindBadConstructsAction : public PluginASTAction {
FindBadConstructsAction() FindBadConstructsAction()
: check_refcounted_dtors_(true), : check_refcounted_dtors_(true),
check_virtuals_in_implementations_(true), check_virtuals_in_implementations_(true),
check_inner_classes_(false) { check_inner_classes_(false),
check_cc_directory_(false) {
} }
protected: protected:
...@@ -406,7 +408,7 @@ class FindBadConstructsAction : public PluginASTAction { ...@@ -406,7 +408,7 @@ class FindBadConstructsAction : public PluginASTAction {
llvm::StringRef ref) { llvm::StringRef ref) {
return new FindBadConstructsConsumer( return new FindBadConstructsConsumer(
instance, check_refcounted_dtors_, check_virtuals_in_implementations_, instance, check_refcounted_dtors_, check_virtuals_in_implementations_,
check_inner_classes_); check_inner_classes_, check_cc_directory_);
} }
virtual bool ParseArgs(const CompilerInstance& instance, virtual bool ParseArgs(const CompilerInstance& instance,
...@@ -420,6 +422,8 @@ class FindBadConstructsAction : public PluginASTAction { ...@@ -420,6 +422,8 @@ class FindBadConstructsAction : public PluginASTAction {
check_virtuals_in_implementations_ = false; check_virtuals_in_implementations_ = false;
} else if (args[i] == "check-inner-classes") { } else if (args[i] == "check-inner-classes") {
check_inner_classes_ = true; check_inner_classes_ = true;
} else if (args[i] == "check-cc-directory") {
check_cc_directory_ = true;
} else { } else {
parsed = false; parsed = false;
llvm::errs() << "Unknown argument: " << args[i] << "\n"; llvm::errs() << "Unknown argument: " << args[i] << "\n";
...@@ -433,6 +437,7 @@ class FindBadConstructsAction : public PluginASTAction { ...@@ -433,6 +437,7 @@ class FindBadConstructsAction : public PluginASTAction {
bool check_refcounted_dtors_; bool check_refcounted_dtors_;
bool check_virtuals_in_implementations_; bool check_virtuals_in_implementations_;
bool check_inner_classes_; bool check_inner_classes_;
bool check_cc_directory_;
}; };
} // namespace } // namespace
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment