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