Thanks! On Fri, Mar 31, 2017 at 9:30 AM, Daniel Jasper via cfe-commits < cfe-commits@lists.llvm.org> wrote:
> Author: djasper > Date: Fri Mar 31 08:30:24 2017 > New Revision: 299214 > > URL: http://llvm.org/viewvc/llvm-project?rev=299214&view=rev > Log: > clang-format: Fix post-commit review comment of r299204, use Style.isCpp(). > > Also, while at it, s/IsCpp/isCpp/ so that it follows LLVM style. > > Modified: > cfe/trunk/include/clang/Format/Format.h > cfe/trunk/lib/Format/ContinuationIndenter.cpp > cfe/trunk/lib/Format/Format.cpp > cfe/trunk/lib/Format/FormatTokenLexer.cpp > cfe/trunk/lib/Format/TokenAnnotator.cpp > cfe/trunk/lib/Format/UnwrappedLineParser.cpp > > Modified: cfe/trunk/include/clang/Format/Format.h > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/ > clang/Format/Format.h?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/include/clang/Format/Format.h (original) > +++ cfe/trunk/include/clang/Format/Format.h Fri Mar 31 08:30:24 2017 > @@ -963,7 +963,7 @@ struct FormatStyle { > /// Should be used for TableGen code. > LK_TableGen > }; > - bool IsCpp() const { return Language == LK_Cpp || Language == LK_ObjC; } > + bool isCpp() const { return Language == LK_Cpp || Language == LK_ObjC; } > > /// \brief Language, this format style is targeted at. > LanguageKind Language; > > Modified: cfe/trunk/lib/Format/ContinuationIndenter.cpp > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ > ContinuationIndenter.cpp?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/lib/Format/ContinuationIndenter.cpp (original) > +++ cfe/trunk/lib/Format/ContinuationIndenter.cpp Fri Mar 31 08:30:24 2017 > @@ -158,7 +158,7 @@ bool ContinuationIndenter::mustBreak(con > return true; > if ((startsNextParameter(Current, Style) || Previous.is(tok::semi) || > (Previous.is(TT_TemplateCloser) && Current.is(TT_StartOfName) && > - Style.IsCpp() && > + Style.isCpp() && > // FIXME: This is a temporary workaround for the case where > clang-format > // sets BreakBeforeParameter to avoid bin packing and this > creates a > // completely unnecessary line break after a template type that > isn't > @@ -605,7 +605,7 @@ unsigned ContinuationIndenter::addTokenO > // Any break on this level means that the parent level has been broken > // and we need to avoid bin packing there. > bool NestedBlockSpecialCase = > - !Style.IsCpp() && Current.is(tok::r_brace) && State.Stack.size() > > 1 && > + !Style.isCpp() && Current.is(tok::r_brace) && State.Stack.size() > > 1 && > State.Stack[State.Stack.size() - 2].NestedBlockInlined; > if (!NestedBlockSpecialCase) > for (unsigned i = 0, e = State.Stack.size() - 1; i != e; ++i) > > Modified: cfe/trunk/lib/Format/Format.cpp > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ > Format.cpp?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/lib/Format/Format.cpp (original) > +++ cfe/trunk/lib/Format/Format.cpp Fri Mar 31 08:30:24 2017 > @@ -1671,7 +1671,7 @@ bool isDeletedHeader(llvm::StringRef Hea > tooling::Replacements > fixCppIncludeInsertions(StringRef Code, const tooling::Replacements > &Replaces, > const FormatStyle &Style) { > - if (!Style.IsCpp()) > + if (!Style.isCpp()) > return Replaces; > > tooling::Replacements HeaderInsertions; > @@ -1895,7 +1895,7 @@ LangOptions getFormattingLangOpts(const > LangOpts.CPlusPlus11 = Style.Standard == FormatStyle::LS_Cpp03 ? 0 : 1; > LangOpts.CPlusPlus14 = Style.Standard == FormatStyle::LS_Cpp03 ? 0 : 1; > LangOpts.LineComment = 1; > - bool AlternativeOperators = Style.IsCpp(); > + bool AlternativeOperators = Style.isCpp(); > LangOpts.CXXOperatorNames = AlternativeOperators ? 1 : 0; > LangOpts.Bool = 1; > LangOpts.ObjC1 = 1; > > Modified: cfe/trunk/lib/Format/FormatTokenLexer.cpp > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ > FormatTokenLexer.cpp?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/lib/Format/FormatTokenLexer.cpp (original) > +++ cfe/trunk/lib/Format/FormatTokenLexer.cpp Fri Mar 31 08:30:24 2017 > @@ -560,7 +560,7 @@ FormatToken *FormatTokenLexer::getNextTo > Column = FormatTok->LastLineColumnWidth; > } > > - if (Style.IsCpp()) { > + if (Style.isCpp()) { > if (!(Tokens.size() > 0 && Tokens.back()->Tok.getIdentifierInfo() && > Tokens.back()->Tok.getIdentifierInfo()->getPPKeywordID() == > tok::pp_define) && > > Modified: cfe/trunk/lib/Format/TokenAnnotator.cpp > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ > TokenAnnotator.cpp?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/lib/Format/TokenAnnotator.cpp (original) > +++ cfe/trunk/lib/Format/TokenAnnotator.cpp Fri Mar 31 08:30:24 2017 > @@ -311,13 +311,13 @@ private: > // In C++, this can happen either in array of templates (foo<int>[10]) > // or when array is a nested template type > (unique_ptr<type1<type2>[]>). > bool CppArrayTemplates = > - Style.IsCpp() && Parent && > + Style.isCpp() && Parent && > Parent->is(TT_TemplateCloser) && > (Contexts.back().CanBeExpression || Contexts.back().IsExpression > || > Contexts.back().InTemplateArgument); > > bool StartsObjCMethodExpr = > - !CppArrayTemplates && Style.IsCpp() && > + !CppArrayTemplates && Style.isCpp() && > Contexts.back().CanBeExpression && Left->isNot(TT_LambdaLSquare) > && > CurrentToken->isNot(tok::l_brace) && > (!Parent || > @@ -435,7 +435,7 @@ private: > if (CurrentToken->isOneOf(tok::colon, tok::l_brace)) { > FormatToken *Previous = CurrentToken->getPreviousNonComment(); > if (((CurrentToken->is(tok::colon) && > - (!Contexts.back().ColonIsDictLiteral || !Style.IsCpp())) > || > + (!Contexts.back().ColonIsDictLiteral || !Style.isCpp())) > || > Style.Language == FormatStyle::LK_Proto) && > (Previous->Tok.getIdentifierInfo() || > Previous->is(tok::string_literal))) > @@ -1220,7 +1220,7 @@ private: > /// \brief Determine whether ')' is ending a cast. > bool rParenEndsCast(const FormatToken &Tok) { > // C-style casts are only used in C++ and Java. > - if (!Style.IsCpp() && Style.Language != FormatStyle::LK_Java) > + if (!Style.isCpp() && Style.Language != FormatStyle::LK_Java) > return false; > > // Empty parens aren't casts and there are no casts at the end of the > line. > @@ -2233,7 +2233,7 @@ bool TokenAnnotator::spaceRequiredBefore > const FormatToken &Left = *Right.Previous; > if (Right.Tok.getIdentifierInfo() && Left.Tok.getIdentifierInfo()) > return true; // Never ever merge two identifiers. > - if (Style.IsCpp()) { > + if (Style.isCpp()) { > if (Left.is(tok::kw_operator)) > return Right.is(tok::coloncolon); > } else if (Style.Language == FormatStyle::LK_Proto) { > > Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp > URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/ > UnwrappedLineParser.cpp?rev=299214&r1=299213&r2=299214&view=diff > ============================================================ > ================== > --- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original) > +++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Fri Mar 31 08:30:24 2017 > @@ -916,8 +916,7 @@ void UnwrappedLineParser::parseStructura > return; > } > } > - if ((Style.Language == FormatStyle::LK_Cpp || > - Style.Language == FormatStyle::LK_ObjC) && > + if (Style.isCpp() && > FormatTok->isOneOf(Keywords.kw_signals, Keywords.kw_qsignals, > Keywords.kw_slots, Keywords.kw_qslots)) { > nextToken(); > @@ -952,7 +951,7 @@ void UnwrappedLineParser::parseStructura > if (!parseEnum()) > break; > // This only applies for C++. > - if (!Style.IsCpp()) { > + if (!Style.isCpp()) { > addUnwrappedLine(); > return; > } > @@ -1133,7 +1132,7 @@ void UnwrappedLineParser::parseStructura > } > > bool UnwrappedLineParser::tryToParseLambda() { > - if (!Style.IsCpp()) { > + if (!Style.isCpp()) { > nextToken(); > return false; > } > @@ -1743,7 +1742,7 @@ bool UnwrappedLineParser::parseEnum() { > nextToken(); > // If there are two identifiers in a row, this is likely an > elaborate > // return type. In Java, this can be "implements", etc. > - if (Style.IsCpp() && FormatTok->is(tok::identifier)) > + if (Style.isCpp() && FormatTok->is(tok::identifier)) > return false; > } > } > > > _______________________________________________ > cfe-commits mailing list > cfe-commits@lists.llvm.org > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits >
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits