replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Small tweaks to clang-format. 

Now not joining keywords with '::' and not putting a space between
a pointer pointer.

llvm-svn: 169594
This commit is contained in:
Daniel Jasper 2012-12-07 09:52:15 +00:00
parent 378f93e804
commit 2723403f9e
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Format/Format.cpp
View File

@ -696,16 +696,20 @@ private:
return false;
if (Left.is(tok::less) || Right.is(tok::greater) || Right.is(tok::less))
return false;
if (Right.is(tok::amp) || Right.is(tok::star))
return Left.isLiteral() ||
(Left.isNot(tok::star) && Left.isNot(tok::amp) &&
!Style.PointerAndReferenceBindToType);
if (Left.is(tok::amp) || Left.is(tok::star))
return Right.isLiteral() || Style.PointerAndReferenceBindToType;
if (Right.is(tok::star) && Left.is(tok::l_paren))
return false;
if (Right.is(tok::amp) || Right.is(tok::star))
return Left.isLiteral() || !Style.PointerAndReferenceBindToType;
if (Left.is(tok::l_square) || Right.is(tok::l_square) ||
Right.is(tok::r_square))
return false;
if (Left.is(tok::coloncolon) || Right.is(tok::coloncolon))
if (Left.is(tok::coloncolon) ||
(Right.is(tok::coloncolon) &&
(Left.is(tok::identifier) || Left.is(tok::greater))))
return false;
if (Left.is(tok::period) || Right.is(tok::period))
return false;

5
clang/unittests/Format/FormatTest.cpp
View File

@ -277,6 +277,8 @@ TEST_F(FormatTest, UnderstandsAccessSpecifiers) {
TEST_F(FormatTest, FormatsDerivedClass) {
verifyFormat("class A : public B {\n"
"};");
verifyFormat("class A : public ::B {\n"
"};");
}
TEST_F(FormatTest, FormatsEnum) {
@ -474,6 +476,9 @@ TEST_F(FormatTest, UnderstandsUsesOfStar) {
verifyFormat("int a = *b;");
verifyFormat("int a = *b * c;");
verifyFormat("int a = b * *c;");
verifyFormat("int main(int argc, char **argv) {\n}");
verifyGoogleFormat("int main(int argc, char** argv) {\n}");
}
TEST_F(FormatTest, LineStartsWithSpecialCharacter) {