diff options
| author | Daniel Jasper <djasper@google.com> | 2013-03-14 10:50:25 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-03-14 10:50:25 +0000 |
| commit | d3cf17b5f1fed43dbd0cd35c43d15139803c9c84 (patch) | |
| tree | ed633221af9adebae5ef3d3ed19c65e50f8bacfb | |
| parent | 96cead513761d287c88a4f05c712aee3b26b9d6f (diff) | |
Fix dereference formatting in for-loops.
Before: for (char **a = b; * a; ++a) {}
After: for (char **a = b; *a; ++a) {}
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@177037 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Format/TokenAnnotator.cpp | 2 | ||||
| -rw-r--r-- | unittests/Format/FormatTest.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp index 0b8f286ebe..93eeb7f940 100644 --- a/lib/Format/TokenAnnotator.cpp +++ b/lib/Format/TokenAnnotator.cpp @@ -661,7 +661,7 @@ private: return TT_PointerOrReference; if (PrevToken->isOneOf(tok::l_paren, tok::l_square, tok::l_brace, - tok::comma, tok::kw_return, tok::colon, + tok::comma, tok::semi, tok::kw_return, tok::colon, tok::equal) || PrevToken->Type == TT_BinaryOperator || PrevToken->Type == TT_UnaryOperator || PrevToken->Type == TT_CastRParen) diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp index ac9dd64418..86b98b3152 100644 --- a/unittests/Format/FormatTest.cpp +++ b/unittests/Format/FormatTest.cpp @@ -1919,6 +1919,7 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { "const char *const p = reinterpret_cast<const char *const>(q);"); verifyIndependentOfContext("A<int **, int **> a;"); verifyIndependentOfContext("void f(int *a = d * e, int *b = c * d);"); + verifyFormat("for (char **a = b; *a; ++a) {\n}"); verifyFormat( "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa(\n" |