maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Never merge < and ::, as it produces different tokens. 

Before: vector<::Type> t;
After:  vector< ::Type> t;
llvm-svn: 172601
This commit is contained in:
Daniel Jasper 2013-01-16 07:19:28 +00:00
parent c36492b598
commit 736c14fac4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1176,6 +1176,10 @@ private:
Right.is(tok::l_paren) || Right.is(tok::l_brace) ||
Right.is(tok::kw_true) || Right.is(tok::kw_false)))
return false;
if (Left.is(tok::coloncolon))
return false;
if (Right.is(tok::coloncolon))
return Left.isNot(tok::identifier) && Left.isNot(tok::greater);
if (Left.is(tok::less) || Right.is(tok::greater) || Right.is(tok::less))
return false;
if (Right.is(tok::amp) || Right.is(tok::star))
@ -1191,10 +1195,6 @@ private:
return false;
if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr)
return false;
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;
if (Left.is(tok::colon))

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

@ -131,6 +131,10 @@ TEST_F(FormatTest, FormatsNestedCall) {
verifyFormat("Method(f1(f2, (f3())));");
}
TEST_F(FormatTest, ImportantSpaces) {
verifyFormat("vector< ::Type> v;");
}
//===----------------------------------------------------------------------===//
// Tests for control statements.
//===----------------------------------------------------------------------===//