[PATCH] Formatter: Correctly format stars in `sizeof(int**)` and similar places.
Nico Weber
thakis at chromium.org
Mon Feb 11 09:11:41 PST 2013
On Mon, Feb 11, 2013 at 9:10 AM, Nico Weber <thakis at chromium.org> wrote:
> Hi djasper,
>
> http://llvm-reviews.chandlerc.com/D384
>
> CHANGE SINCE LAST DIFF
(This is misleading. I changed the diff to have more context lines,
which apparently confuses phab.)
> http://llvm-reviews.chandlerc.com/D384?vs=932&id=946#toc
>
> Files:
> unittests/Format/FormatTest.cpp
> lib/Format/TokenAnnotator.cpp
>
> Index: unittests/Format/FormatTest.cpp
> ===================================================================
> --- unittests/Format/FormatTest.cpp
> +++ unittests/Format/FormatTest.cpp
> @@ -1615,6 +1615,14 @@
> verifyIndependentOfContext("a * (a + b);");
> verifyIndependentOfContext("(a *)(a + b);");
> verifyIndependentOfContext("int *pa = (int *)&a;");
> + verifyIndependentOfContext("return sizeof(int **);");
> + verifyIndependentOfContext("return sizeof(int ******);");
> + verifyIndependentOfContext("return (int **&)a;");
> + verifyGoogleFormat("return sizeof(int**);");
> + verifyIndependentOfContext("Type **A = static_cast<Type **>(P);");
> + verifyGoogleFormat("Type** A = static_cast<Type**>(P);");
> + // FIXME: The newline is wrong.
> + verifyFormat("auto a = [](int **&, int ***) {}\n;");
>
> verifyIndependentOfContext("InvalidRegions[*R] = 0;");
>
> @@ -2540,8 +2548,7 @@
> verifyFormat("@dynamic textColor;");
> verifyFormat("char *buf1 = @encode(int *);");
> verifyFormat("char *buf1 = @encode(typeof(4 * 5));");
> - // FIXME: Enable once PR14884 is fixed:
> - //verifyFormat("char *buf1 = @encode(int **);");
> + verifyFormat("char *buf1 = @encode(int **);");
> verifyFormat("Protocol *proto = @protocol(p1);");
> verifyFormat("SEL s = @selector(foo:);");
> verifyFormat("@synchronized(self) {\n"
> Index: lib/Format/TokenAnnotator.cpp
> ===================================================================
> --- lib/Format/TokenAnnotator.cpp
> +++ lib/Format/TokenAnnotator.cpp
> @@ -86,6 +86,7 @@
> Contexts.back().LookForFunctionName = Line.MustBeDeclaration;
> }
>
> +private:
> bool parseAngle() {
> if (CurrentToken == NULL)
> return false;
> @@ -448,6 +449,7 @@
> next();
> }
>
> +public:
> LineType parseLine() {
> int PeriodsAndArrows = 0;
> bool CanBeBuilderTypeStmt = true;
> @@ -483,6 +485,7 @@
> return LT_Other;
> }
>
> +private:
> void next() {
> if (CurrentToken != NULL) {
> determineTokenType(*CurrentToken);
> @@ -495,7 +498,6 @@
> CurrentToken = NULL;
> }
>
> -private:
> /// \brief A struct to hold information valid in a specific context, e.g.
> /// a pair of parenthesis.
> struct Context {
> @@ -533,19 +535,25 @@
> void determineTokenType(AnnotatedToken &Current) {
> if (getPrecedence(Current) == prec::Assignment) {
> Contexts.back().IsExpression = true;
> - AnnotatedToken *Previous = Current.Parent;
> - while (Previous != NULL && Previous->isNot(tok::comma)) {
> + for (AnnotatedToken *Previous = Current.Parent;
> + Previous && Previous->isNot(tok::comma);
> + Previous = Previous->Parent) {
> if (Previous->Type == TT_BinaryOperator &&
> (Previous->is(tok::star) || Previous->is(tok::amp))) {
> Previous->Type = TT_PointerOrReference;
> }
> - Previous = Previous->Parent;
> }
> - }
> - if (Current.is(tok::kw_return) || Current.is(tok::kw_throw) ||
> - (Current.is(tok::l_paren) && !Line.MustBeDeclaration &&
> - (Current.Parent == NULL || Current.Parent->isNot(tok::kw_for))))
> + } else if (Current.is(tok::kw_return) || Current.is(tok::kw_throw) ||
> + (Current.is(tok::l_paren) && !Line.MustBeDeclaration &&
> + (!Current.Parent || Current.Parent->isNot(tok::kw_for)))) {
> Contexts.back().IsExpression = true;
> + } else if (Current.is(tok::r_paren) || Current.is(tok::greater) ||
> + Current.is(tok::comma)) {
> + for (AnnotatedToken *Previous = Current.Parent;
> + Previous && (Previous->is(tok::star) || Previous->is(tok::amp));
> + Previous = Previous->Parent)
> + Previous->Type = TT_PointerOrReference;
> + }
>
> if (Current.Type == TT_Unknown) {
> if (Contexts.back().LookForFunctionName && Current.is(tok::l_paren)) {
> @@ -639,10 +647,6 @@
> NextToken->is(tok::l_square))
> return TT_BinaryOperator;
>
> - if (NextToken->is(tok::comma) || NextToken->is(tok::r_paren) ||
> - NextToken->is(tok::greater))
> - return TT_PointerOrReference;
> -
> // It is very unlikely that we are going to find a pointer or reference type
> // definition on the RHS of an assignment.
> if (IsExpression)
> @@ -932,9 +936,11 @@
> if (Right.is(tok::amp) || Right.is(tok::star))
> return Left.FormatTok.Tok.isLiteral() ||
> (Left.isNot(tok::star) && Left.isNot(tok::amp) &&
> - !Style.PointerBindsToType);
> + Left.isNot(tok::l_paren) && !Style.PointerBindsToType);
> if (Left.is(tok::amp) || Left.is(tok::star))
> - return Right.FormatTok.Tok.isLiteral() || Style.PointerBindsToType;
> + return Right.FormatTok.Tok.isLiteral() ||
> + (Right.isNot(tok::star) && Right.isNot(tok::amp) &&
> + Style.PointerBindsToType);
> if (Right.is(tok::star) && Left.is(tok::l_paren))
> return false;
> if (Left.is(tok::l_square))
More information about the cfe-commits
mailing list