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

Fix "*" formatting when creating arrays of pointers. 

Before: A = new int * [10]();
After:  A = new int *[10]();
llvm-svn: 173150
This commit is contained in:
Daniel Jasper 2013-01-22 11:46:26 +00:00
parent 81f0b331dc
commit 0b8206029b
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -958,6 +958,13 @@ public:
while (CurrentToken != NULL) {
if (CurrentToken->is(tok::r_square)) {
if (!CurrentToken->Children.empty() &&
CurrentToken->Children[0].is(tok::l_paren)) {
// An ObjC method call can't be followed by an open parenthesis.
// FIXME: Do we incorrectly label ":" with this?
StartsObjCMethodExpr = false;
Left->Type = TT_Unknown;
}
if (StartsObjCMethodExpr)
objCSelector.markEnd(*CurrentToken);
Left->MatchingParen = CurrentToken;
@ -1325,6 +1332,9 @@ private:
if (NextToken == NULL)
return TT_Unknown;
if (NextToken->is(tok::l_square) && NextToken->Type != TT_ObjCMethodExpr)
return TT_PointerOrReference;
if (PrevToken->is(tok::l_paren) || PrevToken->is(tok::l_square) ||
PrevToken->is(tok::l_brace) || PrevToken->is(tok::comma) ||
PrevToken->is(tok::kw_return) || PrevToken->is(tok::colon) ||

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

@ -1338,6 +1338,9 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) {
verifyFormat("if (*b[i])");
verifyFormat("if (int *a = (&b))");
verifyFormat("while (int *a = &b)");
verifyFormat("A = new SomeType *[Length]();");
verifyGoogleFormat("A = new SomeType* [Length]();");
}
TEST_F(FormatTest, FormatsCasts) {