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

Support for pointers-to-members usage via .* 

Summary: Added support for pointers-to-members usage via .* and a few tests.

Reviewers: djasper

Reviewed By: djasper

CC: cfe-commits, klimek

Differential Revision: http://llvm-reviews.chandlerc.com/D556

llvm-svn: 177537
This commit is contained in:
Alexander Kornienko 2013-03-20 16:41:56 +00:00
parent 291f936351
commit 674be0a3da
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1058,7 +1058,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
if (Tok.is(tok::l_paren) && !Tok.Children.empty() &&
Tok.Children[0].Type == TT_PointerOrReference &&
!Tok.Children[0].Children.empty() &&
Tok.Children[0].Children[0].isNot(tok::r_paren))
Tok.Children[0].Children[0].isNot(tok::r_paren) &&
Tok.Parent->isNot(tok::l_paren))
return true;
if (Tok.Parent->Type == TT_UnaryOperator || Tok.Parent->Type == TT_CastRParen)
return false;
@ -1071,7 +1072,8 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
Tok.Parent->Type == TT_TemplateCloser &&
Style.Standard != FormatStyle::LS_Cpp11;
}
if (Tok.is(tok::arrowstar) || Tok.Parent->is(tok::arrowstar))
if (Tok.isOneOf(tok::arrowstar, tok::periodstar) ||
Tok.Parent->isOneOf(tok::arrowstar, tok::periodstar))
return false;
if (Tok.Type == TT_BinaryOperator || Tok.Parent->Type == TT_BinaryOperator)
return true;

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

@ -2000,7 +2000,18 @@ TEST_F(FormatTest, UnderstandsTemplateParameters) {
TEST_F(FormatTest, UnderstandsBinaryOperators) {
verifyFormat("COMPARE(a, ==, b);");
verifyFormat("(a->*f)()");
}
TEST_F(FormatTest, UnderstandsPointersToMembers) {
verifyFormat("int A::*x;");
// FIXME: Recognize pointers to member functions.
//verifyFormat("int (S::*func)(void *);");
verifyFormat("int(S::*func)(void *);");
verifyFormat("(a->*f)();");
verifyFormat("a->*x;");
verifyFormat("(a.*f)();");
verifyFormat("((*a).*f)();");
verifyFormat("a.*x;");
}
TEST_F(FormatTest, UnderstandsUnaryOperators) {