On Thu, May 8, 2014 at 2:05 AM, Nikola Smiljanic <[email protected]> wrote:
> Author: nikola > Date: Wed May 7 19:05:13 2014 > New Revision: 208269 > > URL: http://llvm.org/viewvc/llvm-project?rev=208269&view=rev > Log: > Enable alternative tokens by default for clang-format. > > Patch by Bobby Moretti. > > Modified: > cfe/trunk/include/clang/Format/Format.h > cfe/trunk/lib/Format/Format.cpp > cfe/trunk/tools/clang-format/ClangFormat.cpp > cfe/trunk/unittests/Format/FormatTest.cpp > cfe/trunk/unittests/Format/FormatTestProto.cpp > > Modified: cfe/trunk/include/clang/Format/Format.h > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Format/Format.h?rev=208269&r1=208268&r2=208269&view=diff > > ============================================================================== > --- cfe/trunk/include/clang/Format/Format.h (original) > +++ cfe/trunk/include/clang/Format/Format.h Wed May 7 19:05:13 2014 > @@ -460,8 +460,8 @@ tooling::Replacements reformat(const For > /// > /// \param Standard determines lexing mode: LC_Cpp11 and LS_Auto turn on > C++11 > /// lexing mode, LS_Cpp03 - C++03 mode. > -LangOptions getFormattingLangOpts(FormatStyle::LanguageStandard Standard = > - FormatStyle::LS_Cpp11); > +LangOptions getFormattingLangOpts( > + FormatStyle::LanguageStandard Standard = FormatStyle::LS_Cpp11); > > /// \brief Description to be used for help text for a llvm::cl option for > /// specifying format style. The description is closely related to the > operation > > Modified: cfe/trunk/lib/Format/Format.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=208269&r1=208268&r2=208269&view=diff > > ============================================================================== > --- cfe/trunk/lib/Format/Format.cpp (original) > +++ cfe/trunk/lib/Format/Format.cpp Wed May 7 19:05:13 2014 > @@ -1856,6 +1856,7 @@ LangOptions getFormattingLangOpts(Format > LangOpts.CPlusPlus11 = Standard == FormatStyle::LS_Cpp03 ? 0 : 1; > LangOpts.CPlusPlus1y = Standard == FormatStyle::LS_Cpp03 ? 0 : 1; > LangOpts.LineComment = 1; > + LangOpts.CXXOperatorNames = 1; > LangOpts.Bool = 1; > LangOpts.ObjC1 = 1; > LangOpts.ObjC2 = 1; > > Modified: cfe/trunk/tools/clang-format/ClangFormat.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-format/ClangFormat.cpp?rev=208269&r1=208268&r2=208269&view=diff > > ============================================================================== > --- cfe/trunk/tools/clang-format/ClangFormat.cpp (original) > +++ cfe/trunk/tools/clang-format/ClangFormat.cpp Wed May 7 19:05:13 2014 > @@ -246,8 +246,8 @@ static bool format(StringRef FileName) { > return true; > } else { > if (Cursor.getNumOccurrences() != 0) > - outs() << "{ \"Cursor\": " << tooling::shiftedCodePosition( > - Replaces, Cursor) << " }\n"; > + outs() << "{ \"Cursor\": " > + << tooling::shiftedCodePosition(Replaces, Cursor) << " > }\n"; > Rewrite.getEditBuffer(ID).write(outs()); > } > } > > Modified: cfe/trunk/unittests/Format/FormatTest.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=208269&r1=208268&r2=208269&view=diff > > ============================================================================== > --- cfe/trunk/unittests/Format/FormatTest.cpp (original) > +++ cfe/trunk/unittests/Format/FormatTest.cpp Wed May 7 19:05:13 2014 > @@ -270,6 +270,17 @@ TEST_F(FormatTest, ReformatsMovedLines) > 9, 5, getLLVMStyle())); > } > > +TEST_F(FormatTest, RecognizesBinaryOperatorKeywords) { > + verifyFormat("x = (a) and (b);"); > + verifyFormat("x = (a) or (b);"); > + verifyFormat("x = (a) bitand (b);"); > + verifyFormat("x = (a) bitor (b);"); > + verifyFormat("x = (a) not_eq (b);"); > + verifyFormat("x = (a) and_eq (b);"); > + verifyFormat("x = (a) or_eq (b);"); > + verifyFormat("x = (a) xor (b);"); > +} > The indentation is off here. Maybe use clang-format ;-). > + > > > //===----------------------------------------------------------------------===// > // Tests for control statements. > > > //===----------------------------------------------------------------------===// > @@ -2861,9 +2872,21 @@ TEST_F(FormatTest, LineBreakingInBinaryE > "bool aaaaaaa =\n" > " > aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaa).aaaaaaaaaaaaaaaaaaa() ||\n" > " bbbbbbbb();"); > + verifyFormat( > + "bool aaaaaaa =\n" > + " > aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(aaa).aaaaaaaaaaaaaaaaaaa() or\n" > + " bbbbbbbb();"); > + > verifyFormat("bool aaaaaaaaaaaaaaaaaaaaa =\n" > " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa != bbbbbbbbbbbbbbbbbb > &&\n" > " ccccccccc == ddddddddddd;"); > + verifyFormat("bool aaaaaaaaaaaaaaaaaaaaa =\n" > + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa != bbbbbbbbbbbbbbbbbb > and\n" > + " ccccccccc == ddddddddddd;"); > + verifyFormat( > + "bool aaaaaaaaaaaaaaaaaaaaa =\n" > + " aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa not_eq bbbbbbbbbbbbbbbbbb > and\n" > + " ccccccccc == ddddddddddd;"); > > verifyFormat("aaaaaa = aaaaaaa(aaaaaaa, // break\n" > " aaaaaa) &&\n" > @@ -3609,20 +3632,42 @@ TEST_F(FormatTest, BreaksAccordingToOper > verifyFormat( > "if (aaaaaaaaaaaaaaaaaaaaaaaaa ||\n" > " bbbbbbbbbbbbbbbbbbbbbbbbb && ccccccccccccccccccccccccc) {\n}"); > + verifyFormat( > + "if (aaaaaaaaaaaaaaaaaaaaaaaaa or\n" > + " bbbbbbbbbbbbbbbbbbbbbbbbb and cccccccccccccccccccccccc) {\n}"); > + > verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa && > bbbbbbbbbbbbbbbbbbbbbbbbb ||\n" > " ccccccccccccccccccccccccc) {\n}"); > + verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa and > bbbbbbbbbbbbbbbbbbbbbbbb or\n" > + " ccccccccccccccccccccccccc) {\n}"); > + > verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa || > bbbbbbbbbbbbbbbbbbbbbbbbb ||\n" > " ccccccccccccccccccccccccc) {\n}"); > + verifyFormat("if (aaaaaaaaaaaaaaaaaaaaaaaaa or > bbbbbbbbbbbbbbbbbbbbbbbbb or\n" > + " ccccccccccccccccccccccccc) {\n}"); > + > verifyFormat( > "if ((aaaaaaaaaaaaaaaaaaaaaaaaa || bbbbbbbbbbbbbbbbbbbbbbbbb) &&\n" > " ccccccccccccccccccccccccc) {\n}"); > + verifyFormat( > + "if ((aaaaaaaaaaaaaaaaaaaaaaaaa or bbbbbbbbbbbbbbbbbbbbbbbbb) and\n" > + " ccccccccccccccccccccccccc) {\n}"); > + > verifyFormat("return aaaa & AAAAAAAAAAAAAAAAAAAAAAAAAAAAA ||\n" > " bbbb & BBBBBBBBBBBBBBBBBBBBBBBBBBBBB ||\n" > " cccc & CCCCCCCCCCCCCCCCCCCCCCCCCC ||\n" > " dddd & DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD;"); > + verifyFormat("return aaaa & AAAAAAAAAAAAAAAAAAAAAAAAAAAAA or\n" > + " bbbb & BBBBBBBBBBBBBBBBBBBBBBBBBBBBB or\n" > + " cccc & CCCCCCCCCCCCCCCCCCCCCCCCCC or\n" > + " dddd & DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD;"); > + > verifyFormat("if ((aaaaaaaaaa != aaaaaaaaaaaaaaa ||\n" > " aaaaaaaaaaaaaaaaaaaaaaaa() >= aaaaaaaaaaaaaaaaaaaa) > &&\n" > " aaaaaaaaaaaaaaa != aa) {\n}"); > + verifyFormat("if ((aaaaaaaaaa != aaaaaaaaaaaaaaa or\n" > + " aaaaaaaaaaaaaaaaaaaaaaaa() >= aaaaaaaaaaaaaaaaaaaa) > and\n" > + " aaaaaaaaaaaaaaa != aa) {\n}"); > } > > TEST_F(FormatTest, BreaksAfterAssignments) { > > Modified: cfe/trunk/unittests/Format/FormatTestProto.cpp > URL: > http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTestProto.cpp?rev=208269&r1=208268&r2=208269&view=diff > > ============================================================================== > --- cfe/trunk/unittests/Format/FormatTestProto.cpp (original) > +++ cfe/trunk/unittests/Format/FormatTestProto.cpp Wed May 7 19:05:13 2014 > @@ -52,10 +52,10 @@ TEST_F(FormatTestProto, FormatsMessages) > "}"); > > verifyFormat("message SomeMessage {\n" > - " optional > really.really.long.and.qualified.type.aaaaaaa\n" > + " optional > really.really.long.qualified.type.aaa.aaaaaaa\n" > " fiiiiiiiiiiiiiiiiiiiiiiiiield = 1;\n" > " optional\n" > - " > really.really.long.and.qualified.type.aaaaaaa.aaaaaaaa\n" > + " > really.really.long.qualified.type.aaa.aaaaaaa.aaaaaaaa\n" > " another_fiiiiiiiiiiiiiiiiiiiiield = 2;\n" > "}"); > } > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits >
_______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
