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

Formatter: No space after & and * in front of ObjC message expressions. 

1. let determineStarAmp() check of unary operators before checking for
   "is next '['". That check was added in r173150, and the test from that
   revision passes either way.

2. change determineStarAmp() to categorize '*' and '&' after '=' as unary
   operator.

3. don't let parseSquare() overwrite the type of a '*' or '&' before the start
   of an objc message expression if has the role of unary operator.

llvm-svn: 174489
This commit is contained in:
Nico Weber 2013-02-06 06:20:11 +00:00
parent 231e7aa460
commit 5d2624e53a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Format/TokenAnnotator.cpp
View File

@ -224,15 +224,19 @@ public:
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.
// An ObjC method call is rarely followed by an open parenthesis.
// FIXME: Do we incorrectly label ":" with this?
StartsObjCMethodExpr = false;
Left->Type = TT_Unknown;
}
if (StartsObjCMethodExpr) {
objCSelector.markEnd(*CurrentToken);
// determineStarAmpUsage() thinks that '*' '[' is allocating an
// array of pointers, but if '[' starts a selector then '*' is a
// binary operator.
if (Left->Parent != NULL &&
(Left->Parent->is(tok::star) || Left->Parent->is(tok::amp)))
(Left->Parent->is(tok::star) || Left->Parent->is(tok::amp)) &&
Left->Parent->Type == TT_PointerOrReference)
Left->Parent->Type = TT_BinaryOperator;
}
Left->MatchingParen = CurrentToken;
@ -607,16 +611,16 @@ private:
if (NextToken == NULL)
return TT_Unknown;
if (NextToken->is(tok::l_square))
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) ||
PrevToken->Type == TT_BinaryOperator ||
PrevToken->is(tok::equal) || PrevToken->Type == TT_BinaryOperator ||
PrevToken->Type == TT_UnaryOperator || PrevToken->Type == TT_CastRParen)
return TT_UnaryOperator;
if (NextToken->is(tok::l_square))
return TT_PointerOrReference;
if (PrevToken->FormatTok.Tok.isLiteral() || PrevToken->is(tok::r_paren) ||
PrevToken->is(tok::r_square) || NextToken->FormatTok.Tok.isLiteral() ||
isUnaryOperator(*NextToken) || NextToken->is(tok::l_paren) ||

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

@ -2245,9 +2245,8 @@ TEST_F(FormatTest, FormatObjCMethodExpr) {
verifyFormat("int a = --[foo bar:baz];");
verifyFormat("int a = sizeof [foo bar:baz];");
verifyFormat("int a = alignof [foo bar:baz];");
// FIXME: no space after & and *.
verifyFormat("int a = & [foo bar:baz];");
verifyFormat("int a = * [foo bar:baz];");
verifyFormat("int a = &[foo bar:baz];");
verifyFormat("int a = *[foo bar:baz];");
// FIXME: Make casts work, without breaking f()[4].
//verifyFormat("int a = (int) [foo bar:baz];");