From 5242a87b7665f03c2cb314f35401c707c72f1543 Mon Sep 17 00:00:00 2001 From: Mandeep Singh Grang Date: Tue, 8 Nov 2016 07:50:19 +0000 Subject: [clang-tools-extra] Format sources with clang-format. NFC. Summary: Ran clang-format on all .c/.cpp/.h files in clang-tools-extra. Excluded the test, unittests, clang-reorder-fields, include-fixer, modularize and pptrace directories. Reviewers: klimek, alexfh Subscribers: nemanjai Tags: #clang-tools-extra Differential Revision: https://reviews.llvm.org/D26329 git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@286221 91177308-0d34-0410-b5e6-96231b3b80d8 --- clang-query/Query.cpp | 11 +++++------ clang-query/Query.h | 6 +----- clang-query/QueryParser.cpp | 18 ++++++------------ clang-query/QueryParser.h | 3 +-- 4 files changed, 13 insertions(+), 25 deletions(-) (limited to 'clang-query') diff --git a/clang-query/Query.cpp b/clang-query/Query.cpp index 74eb6ea4..ed27c211 100644 --- a/clang-query/Query.cpp +++ b/clang-query/Query.cpp @@ -65,7 +65,7 @@ struct CollectBoundNodes : MatchFinder::MatchCallback { } }; -} // namespace +} // namespace bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const { unsigned MatchCount = 0; @@ -100,11 +100,10 @@ bool MatchQuery::run(llvm::raw_ostream &OS, QuerySession &QS) const { if (R.isValid()) { TextDiagnostic TD(OS, AST->getASTContext().getLangOpts(), &AST->getDiagnostics().getDiagnosticOptions()); - TD.emitDiagnostic( - R.getBegin(), DiagnosticsEngine::Note, - "\"" + BI->first + "\" binds here", - CharSourceRange::getTokenRange(R), - None, &AST->getSourceManager()); + TD.emitDiagnostic(R.getBegin(), DiagnosticsEngine::Note, + "\"" + BI->first + "\" binds here", + CharSourceRange::getTokenRange(R), None, + &AST->getSourceManager()); } break; } diff --git a/clang-query/Query.h b/clang-query/Query.h index 109336a9..b8c59cb3 100644 --- a/clang-query/Query.h +++ b/clang-query/Query.h @@ -18,11 +18,7 @@ namespace clang { namespace query { -enum OutputKind { - OK_Diag, - OK_Print, - OK_Dump -}; +enum OutputKind { OK_Diag, OK_Print, OK_Dump }; enum QueryKind { QK_Invalid, diff --git a/clang-query/QueryParser.cpp b/clang-query/QueryParser.cpp index e25b6970..15d6bbc1 100644 --- a/clang-query/QueryParser.cpp +++ b/clang-query/QueryParser.cpp @@ -76,9 +76,7 @@ template struct QueryParser::LexOrCompleteWord { return *this; } - T Default(const T& Value) const { - return Switch.Default(Value); - } + T Default(const T &Value) const { return Switch.Default(Value); } }; // Lexes a word and stores it in Word. Returns a LexOrCompleteWord object @@ -101,9 +99,9 @@ QueryParser::lexOrCompleteWord(StringRef &Word) { QueryRef QueryParser::parseSetBool(bool QuerySession::*Var) { StringRef ValStr; unsigned Value = lexOrCompleteWord(ValStr) - .Case("false", 0) - .Case("true", 1) - .Default(~0u); + .Case("false", 0) + .Case("true", 1) + .Default(~0u); if (Value == ~0u) { return new InvalidQuery("expected 'true' or 'false', got '" + ValStr + "'"); } @@ -145,11 +143,7 @@ enum ParsedQueryKind { PQK_Quit }; -enum ParsedQueryVariable { - PQV_Invalid, - PQV_Output, - PQV_BindRoot -}; +enum ParsedQueryVariable { PQV_Invalid, PQV_Output, PQV_BindRoot }; QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) { std::string ErrStr; @@ -158,7 +152,7 @@ QueryRef makeInvalidQueryFromDiagnostics(const Diagnostics &Diag) { return new InvalidQuery(OS.str()); } -} // namespace +} // namespace QueryRef QueryParser::completeMatcherExpression() { std::vector Comps = Parser::completeExpression( diff --git a/clang-query/QueryParser.h b/clang-query/QueryParser.h index a43f84da..20591815 100644 --- a/clang-query/QueryParser.h +++ b/clang-query/QueryParser.h @@ -37,8 +37,7 @@ public: private: QueryParser(StringRef Line, const QuerySession &QS) - : Begin(Line.begin()), End(Line.end()), - CompletionPos(nullptr), QS(QS) {} + : Begin(Line.begin()), End(Line.end()), CompletionPos(nullptr), QS(QS) {} StringRef lexWord(); -- cgit v1.2.3