Formatter: Correctly format stars in `sizeof(int**)` and similar places.
This redoes how '*' and '&' are classified as pointer / reference markers when
followed by ')', '>', or ','.
Previously, determineStarAmpUsage() marked a single '*' and '&' followed by
')', '>', or ',' as pointer or reference marker. Now, all '*'s and '&'s
preceding ')', '>', or ',' are marked as pointer / reference markers. Fixes
PR14884.
Since only the last '*' in 'int ***' was marked as pointer before (the rest
were unary operators, which don't reach spaceRequiredBetween()),
spaceRequiredBetween() now had to be thought about handing multiple '*'s in
sequence.
Before:
return sizeof(int * *);
Type **A = static_cast<Type * *>(P);
Now:
return sizeof(int**);
Type **A = static_cast<Type **>(P);
While here, also make all methods of AnnotatingParser except parseLine()
private.
Review URL: http://llvm-reviews.chandlerc.com/D384
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174975 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 1e814b2..80089de 100644
--- a/lib/Format/TokenAnnotator.cpp
+++ b/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))