diff options
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 6 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 7c4797978f..3578162c3f 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -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; diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index 0edb19166d..4caffd911b 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -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) { |