Author: mydeveloperday Date: 2020-04-27T20:41:37+01:00 New Revision: f594e3d2ab92fc4e00359d017a7ea3c8deb771ce
URL: https://github.com/llvm/llvm-project/commit/f594e3d2ab92fc4e00359d017a7ea3c8deb771ce DIFF: https://github.com/llvm/llvm-project/commit/f594e3d2ab92fc4e00359d017a7ea3c8deb771ce.diff LOG: [clang-format] NFC clang-format the clang-format sources Summary: In recent patches the clang-format code has become un-formatted, correct this before making additional changes Reviewers: mitchell-stellar, sylvestre.ledru, Abpostelnicu, Wawha, jbcoe Reviewed By: sylvestre.ledru, Abpostelnicu, jbcoe Subscribers: cfe-commits Tags: #clang, #clang-format Differential Revision: https://reviews.llvm.org/D78909 Added: Modified: clang/lib/Format/ContinuationIndenter.cpp clang/lib/Format/TokenAnnotator.cpp clang/lib/Format/UnwrappedLineParser.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp index e70ae7efb0c3..5fdb1dbc433c 100644 --- a/clang/lib/Format/ContinuationIndenter.cpp +++ b/clang/lib/Format/ContinuationIndenter.cpp @@ -1466,10 +1466,11 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State, ParenState(&Current, NewIndent, LastSpace, AvoidBinPacking, NoLineBreak)); State.Stack.back().NestedBlockIndent = NestedBlockIndent; State.Stack.back().BreakBeforeParameter = BreakBeforeParameter; - State.Stack.back().HasMultipleNestedBlocks = (Current.BlockParameterCount > 1); + State.Stack.back().HasMultipleNestedBlocks = + (Current.BlockParameterCount > 1); - if (Style.BraceWrapping.BeforeLambdaBody && - Current.Next != nullptr && Current.Tok.is(tok::l_paren)) { + if (Style.BraceWrapping.BeforeLambdaBody && Current.Next != nullptr && + Current.Tok.is(tok::l_paren)) { // Search for any parameter that is a lambda FormatToken const *next = Current.Next; while (next != nullptr) { diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 6532f8108f08..3e441100a2f0 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -395,7 +395,7 @@ class AnnotatingParser { if (!AttrTok) return false; - + // Allow an attribute to be the only content of a file. AttrTok = AttrTok->Next; if (!AttrTok) @@ -2837,9 +2837,10 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line, // operator std::Foo*() // operator C<T>::D<U>*() // dependent on PointerAlignment style. - if (Previous && (Previous->endsSequence(tok::kw_operator) || - Previous->endsSequence(tok::kw_const, tok::kw_operator) || - Previous->endsSequence(tok::kw_volatile, tok::kw_operator))) + if (Previous && + (Previous->endsSequence(tok::kw_operator) || + Previous->endsSequence(tok::kw_const, tok::kw_operator) || + Previous->endsSequence(tok::kw_volatile, tok::kw_operator))) return (Style.PointerAlignment != FormatStyle::PAS_Left); } const auto SpaceRequiredForArrayInitializerLSquare = @@ -3325,22 +3326,20 @@ static bool isOneChildWithoutMustBreakBefore(const FormatToken &Tok) { if (Tok.Children.size() != 1) return false; FormatToken *curElt = Tok.Children[0]->First; - while (curElt) { - if (curElt->MustBreakBefore) - return false; - curElt = curElt->Next; - } + while (curElt) { + if (curElt->MustBreakBefore) + return false; + curElt = curElt->Next; + } return true; } -static bool -isAllmanLambdaBrace(const FormatToken &Tok) { +static bool isAllmanLambdaBrace(const FormatToken &Tok) { return (Tok.is(tok::l_brace) && Tok.BlockKind == BK_Block && - !Tok.isOneOf(TT_ObjCBlockLBrace, TT_DictLiteral)); + !Tok.isOneOf(TT_ObjCBlockLBrace, TT_DictLiteral)); } -static bool -isAllmanBraceIncludedBreakableLambda(const FormatToken &Tok, - FormatStyle::ShortLambdaStyle ShortLambdaOption) { +static bool isAllmanBraceIncludedBreakableLambda( + const FormatToken &Tok, FormatStyle::ShortLambdaStyle ShortLambdaOption) { if (!isAllmanLambdaBrace(Tok)) return false; @@ -3497,7 +3496,7 @@ bool TokenAnnotator::mustBreakBefore(const AnnotatedLine &Line, if (Style.BraceWrapping.BeforeLambdaBody && (isAllmanBraceIncludedBreakableLambda(Left, ShortLambdaOption) || isAllmanBraceIncludedBreakableLambda(Right, ShortLambdaOption))) { - return true; + return true; } if (isAllmanBrace(Left) || isAllmanBrace(Right)) diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index c84c951fcaa8..fdae725d625b 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1726,7 +1726,7 @@ bool UnwrappedLineParser::tryToParseBracedList() { bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons, tok::TokenKind ClosingBraceKind) { bool HasError = false; - + // FIXME: Once we have an expression parser in the UnwrappedLineParser, // replace this by using parseAssigmentExpression() inside. do { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
