From 5065bc4b2c3e13be9b1186dcdde7471ffb9e326f Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 18 Feb 2013 12:44:35 +0000 Subject: [PATCH] Correctly determine */& usage in more cases. This fixes llvm.org/PR15248. Before: Test::Test(int b) : a(b *b) {} for (int i = 0; i < a *a; ++i) {} After: Test::Test(int b) : a(b * b) {} for (int i = 0; i < a * a; ++i) {} llvm-svn: 175439 --- clang/lib/Format/TokenAnnotator.cpp | 8 ++++++++ clang/unittests/Format/FormatTest.cpp | 3 +++ 2 files changed, 11 insertions(+) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 25b3a24..19582f2 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -503,6 +503,11 @@ private: CurrentToken = &CurrentToken->Children[0]; else CurrentToken = NULL; + + // Reset token type in case we have already looked at it and then recovered + // from an error (e.g. failure to find the matching >). + if (CurrentToken != NULL) + CurrentToken->Type = TT_Unknown; } /// \brief A struct to hold information valid in a specific context, e.g. @@ -558,6 +563,9 @@ private: Previous && (Previous->is(tok::star) || Previous->is(tok::amp)); Previous = Previous->Parent) Previous->Type = TT_PointerOrReference; + } else if (Current.Parent && + Current.Parent->Type == TT_CtorInitializerColon) { + Contexts.back().IsExpression = true; } if (Current.Type == TT_Unknown) { diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp index 19e34df..c63d756 100644 --- a/clang/unittests/Format/FormatTest.cpp +++ b/clang/unittests/Format/FormatTest.cpp @@ -1666,6 +1666,7 @@ TEST_F(FormatTest, UnderstandsNewAndDelete) { TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { verifyFormat("int *f(int *a) {}"); verifyFormat("int main(int argc, char **argv) {}"); + verifyFormat("Test::Test(int b) : a(b * b) {}"); verifyIndependentOfContext("f(a, *a);"); verifyIndependentOfContext("f(*a);"); verifyIndependentOfContext("int a = b * 10;"); @@ -1758,6 +1759,8 @@ TEST_F(FormatTest, UnderstandsUsesOfStarAndAmp) { " for (const int &v : Values) {\n" " }\n" "}"); + verifyFormat("for (int i = a * a; i < 10; ++i) {\n}"); + verifyFormat("for (int i = 0; i < a * a; ++i) {\n}"); verifyIndependentOfContext("A = new SomeType *[Length]();"); verifyGoogleFormat("A = new SomeType* [Length]();"); -- 2.7.4