2013-01-30 05:01:14 +08:00
|
|
|
//===--- TokenAnnotator.cpp - Format C++ code -----------------------------===//
|
|
|
|
//
|
|
|
|
// The LLVM Compiler Infrastructure
|
|
|
|
//
|
|
|
|
// This file is distributed under the University of Illinois Open Source
|
|
|
|
// License. See LICENSE.TXT for details.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
///
|
|
|
|
/// \file
|
|
|
|
/// \brief This file implements a token annotator, i.e. creates
|
|
|
|
/// \c AnnotatedTokens out of \c FormatTokens with required extra information.
|
|
|
|
///
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "TokenAnnotator.h"
|
|
|
|
#include "clang/Basic/SourceManager.h"
|
|
|
|
#include "clang/Lex/Lexer.h"
|
|
|
|
|
|
|
|
namespace clang {
|
|
|
|
namespace format {
|
|
|
|
|
2013-02-06 00:21:00 +08:00
|
|
|
static bool isUnaryOperator(const AnnotatedToken &Tok) {
|
|
|
|
switch (Tok.FormatTok.Tok.getKind()) {
|
|
|
|
case tok::plus:
|
|
|
|
case tok::plusplus:
|
|
|
|
case tok::minus:
|
|
|
|
case tok::minusminus:
|
|
|
|
case tok::exclaim:
|
|
|
|
case tok::tilde:
|
|
|
|
case tok::kw_sizeof:
|
|
|
|
case tok::kw_alignof:
|
|
|
|
return true;
|
|
|
|
default:
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
static bool isBinaryOperator(const AnnotatedToken &Tok) {
|
|
|
|
// Comma is a binary operator, but does not behave as such wrt. formatting.
|
|
|
|
return getPrecedence(Tok) > prec::Comma;
|
|
|
|
}
|
|
|
|
|
2013-02-04 15:21:18 +08:00
|
|
|
// Returns the previous token ignoring comments.
|
2013-02-07 00:54:35 +08:00
|
|
|
static AnnotatedToken *getPreviousToken(AnnotatedToken &Tok) {
|
|
|
|
AnnotatedToken *PrevToken = Tok.Parent;
|
2013-02-04 15:21:18 +08:00
|
|
|
while (PrevToken != NULL && PrevToken->is(tok::comment))
|
|
|
|
PrevToken = PrevToken->Parent;
|
|
|
|
return PrevToken;
|
|
|
|
}
|
2013-02-07 00:54:35 +08:00
|
|
|
static const AnnotatedToken *getPreviousToken(const AnnotatedToken &Tok) {
|
|
|
|
return getPreviousToken(const_cast<AnnotatedToken &>(Tok));
|
|
|
|
}
|
2013-02-04 15:21:18 +08:00
|
|
|
|
2013-02-08 23:28:42 +08:00
|
|
|
static bool isTrailingComment(AnnotatedToken *Tok) {
|
|
|
|
return Tok != NULL && Tok->is(tok::comment) &&
|
|
|
|
(Tok->Children.empty() ||
|
|
|
|
Tok->Children[0].FormatTok.NewlinesBefore > 0);
|
|
|
|
}
|
|
|
|
|
2013-02-04 15:21:18 +08:00
|
|
|
// Returns the next token ignoring comments.
|
|
|
|
static const AnnotatedToken *getNextToken(const AnnotatedToken &Tok) {
|
|
|
|
if (Tok.Children.empty())
|
|
|
|
return NULL;
|
|
|
|
const AnnotatedToken *NextToken = &Tok.Children[0];
|
|
|
|
while (NextToken->is(tok::comment)) {
|
|
|
|
if (NextToken->Children.empty())
|
|
|
|
return NULL;
|
|
|
|
NextToken = &NextToken->Children[0];
|
|
|
|
}
|
|
|
|
return NextToken;
|
|
|
|
}
|
|
|
|
|
2013-03-13 22:41:29 +08:00
|
|
|
static bool closesScope(const AnnotatedToken &Tok) {
|
|
|
|
return Tok.isOneOf(tok::r_paren, tok::r_brace, tok::r_square) ||
|
|
|
|
Tok.Type == TT_TemplateCloser;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool opensScope(const AnnotatedToken &Tok) {
|
|
|
|
return Tok.isOneOf(tok::l_paren, tok::l_brace, tok::l_square) ||
|
|
|
|
Tok.Type == TT_TemplateOpener;
|
|
|
|
}
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
/// \brief A parser that gathers additional information about tokens.
|
|
|
|
///
|
2013-03-13 00:28:18 +08:00
|
|
|
/// The \c TokenAnnotator tries to match parenthesis and square brakets and
|
2013-01-30 05:01:14 +08:00
|
|
|
/// store a parenthesis levels. It also tries to resolve matching "<" and ">"
|
|
|
|
/// into template parameter lists.
|
|
|
|
class AnnotatingParser {
|
|
|
|
public:
|
2013-02-11 23:32:15 +08:00
|
|
|
AnnotatingParser(SourceManager &SourceMgr, Lexer &Lex, AnnotatedLine &Line,
|
|
|
|
IdentifierInfo &Ident_in)
|
2013-02-04 15:21:18 +08:00
|
|
|
: SourceMgr(SourceMgr), Lex(Lex), Line(Line), CurrentToken(&Line.First),
|
2013-02-11 23:32:15 +08:00
|
|
|
KeywordVirtualFound(false), Ident_in(Ident_in) {
|
2013-03-14 21:45:21 +08:00
|
|
|
Contexts.push_back(Context(tok::unknown, 1, /*IsExpression=*/ false));
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
private:
|
2013-01-30 05:01:14 +08:00
|
|
|
bool parseAngle() {
|
|
|
|
if (CurrentToken == NULL)
|
|
|
|
return false;
|
2013-03-14 21:45:21 +08:00
|
|
|
ScopedContextCreator ContextCreator(*this, tok::less, 10);
|
2013-01-30 05:01:14 +08:00
|
|
|
AnnotatedToken *Left = CurrentToken->Parent;
|
2013-02-06 18:05:46 +08:00
|
|
|
Contexts.back().IsExpression = false;
|
2013-01-30 05:01:14 +08:00
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->is(tok::greater)) {
|
|
|
|
Left->MatchingParen = CurrentToken;
|
|
|
|
CurrentToken->MatchingParen = Left;
|
|
|
|
CurrentToken->Type = TT_TemplateCloser;
|
|
|
|
next();
|
|
|
|
return true;
|
|
|
|
}
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::r_paren, tok::r_square, tok::r_brace,
|
|
|
|
tok::pipepipe, tok::ampamp, tok::question,
|
|
|
|
tok::colon))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-02-14 23:01:34 +08:00
|
|
|
updateParameterCount(Left, CurrentToken);
|
2013-01-30 05:01:14 +08:00
|
|
|
if (!consumeToken())
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseParens(bool LookForDecls = false) {
|
|
|
|
if (CurrentToken == NULL)
|
|
|
|
return false;
|
2013-03-14 21:45:21 +08:00
|
|
|
ScopedContextCreator ContextCreator(*this, tok::l_paren, 1);
|
2013-02-06 18:05:46 +08:00
|
|
|
|
|
|
|
// FIXME: This is a bit of a hack. Do better.
|
|
|
|
Contexts.back().ColonIsForRangeExpr =
|
|
|
|
Contexts.size() == 2 && Contexts[0].ColonIsForRangeExpr;
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
bool StartsObjCMethodExpr = false;
|
|
|
|
AnnotatedToken *Left = CurrentToken->Parent;
|
|
|
|
if (CurrentToken->is(tok::caret)) {
|
|
|
|
// ^( starts a block.
|
|
|
|
Left->Type = TT_ObjCBlockLParen;
|
|
|
|
} else if (AnnotatedToken *MaybeSel = Left->Parent) {
|
|
|
|
// @selector( starts a selector.
|
|
|
|
if (MaybeSel->isObjCAtKeyword(tok::objc_selector) && MaybeSel->Parent &&
|
|
|
|
MaybeSel->Parent->is(tok::at)) {
|
|
|
|
StartsObjCMethodExpr = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-06 18:05:46 +08:00
|
|
|
if (StartsObjCMethodExpr) {
|
|
|
|
Contexts.back().ColonIsObjCMethodExpr = true;
|
|
|
|
Left->Type = TT_ObjCMethodExpr;
|
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
// LookForDecls is set when "if (" has been seen. Check for
|
|
|
|
// 'identifier' '*' 'identifier' followed by not '=' -- this
|
|
|
|
// '*' has to be a binary operator but determineStarAmpUsage() will
|
|
|
|
// categorize it as an unary operator, so set the right type here.
|
|
|
|
if (LookForDecls && !CurrentToken->Children.empty()) {
|
|
|
|
AnnotatedToken &Prev = *CurrentToken->Parent;
|
|
|
|
AnnotatedToken &Next = CurrentToken->Children[0];
|
|
|
|
if (Prev.Parent->is(tok::identifier) &&
|
2013-03-13 22:41:29 +08:00
|
|
|
Prev.isOneOf(tok::star, tok::amp, tok::ampamp) &&
|
2013-01-30 05:01:14 +08:00
|
|
|
CurrentToken->is(tok::identifier) && Next.isNot(tok::equal)) {
|
|
|
|
Prev.Type = TT_BinaryOperator;
|
|
|
|
LookForDecls = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (CurrentToken->is(tok::r_paren)) {
|
|
|
|
Left->MatchingParen = CurrentToken;
|
|
|
|
CurrentToken->MatchingParen = Left;
|
|
|
|
|
2013-02-05 18:07:47 +08:00
|
|
|
if (StartsObjCMethodExpr) {
|
2013-02-06 18:05:46 +08:00
|
|
|
CurrentToken->Type = TT_ObjCMethodExpr;
|
|
|
|
if (Contexts.back().FirstObjCSelectorName != NULL) {
|
|
|
|
Contexts.back().FirstObjCSelectorName->LongestObjCSelectorName =
|
|
|
|
Contexts.back().LongestObjCSelectorName;
|
2013-02-05 18:07:47 +08:00
|
|
|
}
|
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
next();
|
|
|
|
return true;
|
|
|
|
}
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::r_square, tok::r_brace))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-02-14 23:01:34 +08:00
|
|
|
updateParameterCount(Left, CurrentToken);
|
2013-01-30 05:01:14 +08:00
|
|
|
if (!consumeToken())
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseSquare() {
|
|
|
|
if (!CurrentToken)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// A '[' could be an index subscript (after an indentifier or after
|
2013-02-10 10:08:05 +08:00
|
|
|
// ')' or ']'), it could be the start of an Objective-C method
|
|
|
|
// expression, or it could the the start of an Objective-C array literal.
|
2013-01-30 05:01:14 +08:00
|
|
|
AnnotatedToken *Left = CurrentToken->Parent;
|
2013-02-07 00:54:35 +08:00
|
|
|
AnnotatedToken *Parent = getPreviousToken(*Left);
|
2013-01-30 05:01:14 +08:00
|
|
|
bool StartsObjCMethodExpr =
|
2013-03-13 15:49:51 +08:00
|
|
|
Contexts.back().CanBeExpression &&
|
2013-03-13 22:41:29 +08:00
|
|
|
(!Parent || Parent->isOneOf(tok::colon, tok::l_square, tok::l_paren,
|
|
|
|
tok::kw_return, tok::kw_throw) ||
|
|
|
|
isUnaryOperator(*Parent) || Parent->Type == TT_ObjCForIn ||
|
|
|
|
Parent->Type == TT_CastRParen ||
|
2013-03-13 15:49:51 +08:00
|
|
|
getBinOpPrecedence(Parent->FormatTok.Tok.getKind(), true, true) >
|
|
|
|
prec::Unknown);
|
2013-03-14 21:45:21 +08:00
|
|
|
ScopedContextCreator ContextCreator(*this, tok::l_square, 10);
|
2013-03-13 15:49:51 +08:00
|
|
|
Contexts.back().IsExpression = true;
|
2013-02-10 10:08:05 +08:00
|
|
|
bool StartsObjCArrayLiteral = Parent && Parent->is(tok::at);
|
2013-01-30 05:01:14 +08:00
|
|
|
|
2013-02-06 18:05:46 +08:00
|
|
|
if (StartsObjCMethodExpr) {
|
|
|
|
Contexts.back().ColonIsObjCMethodExpr = true;
|
|
|
|
Left->Type = TT_ObjCMethodExpr;
|
2013-02-10 10:08:05 +08:00
|
|
|
} else if (StartsObjCArrayLiteral) {
|
|
|
|
Left->Type = TT_ObjCArrayLiteral;
|
2013-02-06 18:05:46 +08:00
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->is(tok::r_square)) {
|
|
|
|
if (!CurrentToken->Children.empty() &&
|
|
|
|
CurrentToken->Children[0].is(tok::l_paren)) {
|
2013-02-06 14:20:11 +08:00
|
|
|
// An ObjC method call is rarely followed by an open parenthesis.
|
2013-01-30 05:01:14 +08:00
|
|
|
// FIXME: Do we incorrectly label ":" with this?
|
|
|
|
StartsObjCMethodExpr = false;
|
|
|
|
Left->Type = TT_Unknown;
|
|
|
|
}
|
2013-02-04 15:21:18 +08:00
|
|
|
if (StartsObjCMethodExpr) {
|
2013-02-06 18:05:46 +08:00
|
|
|
CurrentToken->Type = TT_ObjCMethodExpr;
|
2013-02-06 14:20:11 +08:00
|
|
|
// determineStarAmpUsage() thinks that '*' '[' is allocating an
|
|
|
|
// array of pointers, but if '[' starts a selector then '*' is a
|
|
|
|
// binary operator.
|
2013-03-13 00:28:18 +08:00
|
|
|
if (Parent != NULL && Parent->Type == TT_PointerOrReference)
|
2013-02-07 00:54:35 +08:00
|
|
|
Parent->Type = TT_BinaryOperator;
|
2013-02-10 10:08:05 +08:00
|
|
|
} else if (StartsObjCArrayLiteral) {
|
|
|
|
CurrentToken->Type = TT_ObjCArrayLiteral;
|
2013-02-04 15:21:18 +08:00
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
Left->MatchingParen = CurrentToken;
|
|
|
|
CurrentToken->MatchingParen = Left;
|
2013-02-06 18:05:46 +08:00
|
|
|
if (Contexts.back().FirstObjCSelectorName != NULL)
|
|
|
|
Contexts.back().FirstObjCSelectorName->LongestObjCSelectorName =
|
|
|
|
Contexts.back().LongestObjCSelectorName;
|
2013-01-30 05:01:14 +08:00
|
|
|
next();
|
|
|
|
return true;
|
|
|
|
}
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::r_paren, tok::r_brace))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-02-14 23:01:34 +08:00
|
|
|
updateParameterCount(Left, CurrentToken);
|
2013-01-30 05:01:14 +08:00
|
|
|
if (!consumeToken())
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseBrace() {
|
|
|
|
// Lines are fine to end with '{'.
|
|
|
|
if (CurrentToken == NULL)
|
|
|
|
return true;
|
2013-03-14 21:45:21 +08:00
|
|
|
ScopedContextCreator ContextCreator(*this, tok::l_brace, 1);
|
2013-01-30 05:01:14 +08:00
|
|
|
AnnotatedToken *Left = CurrentToken->Parent;
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->is(tok::r_brace)) {
|
|
|
|
Left->MatchingParen = CurrentToken;
|
|
|
|
CurrentToken->MatchingParen = Left;
|
|
|
|
next();
|
|
|
|
return true;
|
|
|
|
}
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::r_paren, tok::r_square))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-02-14 23:01:34 +08:00
|
|
|
updateParameterCount(Left, CurrentToken);
|
2013-01-30 05:01:14 +08:00
|
|
|
if (!consumeToken())
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
2013-02-20 20:56:39 +08:00
|
|
|
|
2013-02-14 23:01:34 +08:00
|
|
|
void updateParameterCount(AnnotatedToken *Left, AnnotatedToken *Current) {
|
|
|
|
if (Current->is(tok::comma))
|
|
|
|
++Left->ParameterCount;
|
|
|
|
else if (Left->ParameterCount == 0 && Current->isNot(tok::comment))
|
|
|
|
Left->ParameterCount = 1;
|
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
bool parseConditional() {
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->is(tok::colon)) {
|
|
|
|
CurrentToken->Type = TT_ConditionalExpr;
|
|
|
|
next();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
if (!consumeToken())
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool parseTemplateDeclaration() {
|
|
|
|
if (CurrentToken != NULL && CurrentToken->is(tok::less)) {
|
|
|
|
CurrentToken->Type = TT_TemplateOpener;
|
|
|
|
next();
|
|
|
|
if (!parseAngle())
|
|
|
|
return false;
|
2013-02-20 01:14:38 +08:00
|
|
|
if (CurrentToken != NULL)
|
|
|
|
CurrentToken->Parent->ClosesTemplateDeclaration = true;
|
2013-01-30 05:01:14 +08:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool consumeToken() {
|
|
|
|
AnnotatedToken *Tok = CurrentToken;
|
|
|
|
next();
|
|
|
|
switch (Tok->FormatTok.Tok.getKind()) {
|
|
|
|
case tok::plus:
|
|
|
|
case tok::minus:
|
|
|
|
// At the start of the line, +/- specific ObjectiveC method
|
|
|
|
// declarations.
|
|
|
|
if (Tok->Parent == NULL)
|
|
|
|
Tok->Type = TT_ObjCMethodSpecifier;
|
|
|
|
break;
|
|
|
|
case tok::colon:
|
2013-03-18 20:50:26 +08:00
|
|
|
if (Tok->Parent == NULL)
|
|
|
|
return false;
|
2013-01-30 05:01:14 +08:00
|
|
|
// Colons from ?: are handled in parseConditional().
|
2013-03-14 21:45:21 +08:00
|
|
|
if (Tok->Parent->is(tok::r_paren) && Contexts.size() == 1) {
|
2013-01-30 05:01:14 +08:00
|
|
|
Tok->Type = TT_CtorInitializerColon;
|
2013-02-06 18:05:46 +08:00
|
|
|
} else if (Contexts.back().ColonIsObjCMethodExpr ||
|
2013-02-05 18:07:47 +08:00
|
|
|
Line.First.Type == TT_ObjCMethodSpecifier) {
|
2013-01-30 05:01:14 +08:00
|
|
|
Tok->Type = TT_ObjCMethodExpr;
|
2013-02-05 18:07:47 +08:00
|
|
|
Tok->Parent->Type = TT_ObjCSelectorName;
|
2013-02-06 18:05:46 +08:00
|
|
|
if (Tok->Parent->FormatTok.TokenLength >
|
|
|
|
Contexts.back().LongestObjCSelectorName)
|
|
|
|
Contexts.back().LongestObjCSelectorName =
|
|
|
|
Tok->Parent->FormatTok.TokenLength;
|
|
|
|
if (Contexts.back().FirstObjCSelectorName == NULL)
|
|
|
|
Contexts.back().FirstObjCSelectorName = Tok->Parent;
|
|
|
|
} else if (Contexts.back().ColonIsForRangeExpr) {
|
2013-01-30 05:01:14 +08:00
|
|
|
Tok->Type = TT_RangeBasedForLoopColon;
|
2013-02-14 16:42:54 +08:00
|
|
|
} else if (Contexts.size() == 1) {
|
|
|
|
Tok->Type = TT_InheritanceColon;
|
2013-03-14 21:45:21 +08:00
|
|
|
} else if (Contexts.back().ContextKind == tok::l_paren) {
|
|
|
|
Tok->Type = TT_InlineASMColon;
|
2013-02-05 18:07:47 +08:00
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
break;
|
|
|
|
case tok::kw_if:
|
|
|
|
case tok::kw_while:
|
|
|
|
if (CurrentToken != NULL && CurrentToken->is(tok::l_paren)) {
|
|
|
|
next();
|
|
|
|
if (!parseParens(/*LookForDecls=*/ true))
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case tok::kw_for:
|
2013-02-06 18:05:46 +08:00
|
|
|
Contexts.back().ColonIsForRangeExpr = true;
|
2013-01-30 05:01:14 +08:00
|
|
|
next();
|
|
|
|
if (!parseParens())
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
case tok::l_paren:
|
|
|
|
if (!parseParens())
|
|
|
|
return false;
|
Allow breaking between a type and name in variable declarations.
This fixes llvm.org/PR14967 and is generall necessary to avoid
situations where the column limit is exceeded. The challenge is
restricting such lines splits, otherwise clang-format suddenly starts
breaking at bad places.
Before:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string,
SomeOtherTemplateParameter> &ReallyReallyLongParameterName,
const SomeType<string,
SomeOtherTemplateParameter> &AnotherLongParameterName) {}
After:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string, SomeOtherTemplateParameter> &
ReallyReallyLongParameterName,
const SomeType<string, SomeOtherTemplateParameter> &
AnotherLongParameterName) {}
llvm-svn: 175999
2013-02-25 02:54:32 +08:00
|
|
|
if (Line.MustBeDeclaration)
|
|
|
|
Line.MightBeFunctionDecl = true;
|
2013-01-30 05:01:14 +08:00
|
|
|
break;
|
|
|
|
case tok::l_square:
|
|
|
|
if (!parseSquare())
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
case tok::l_brace:
|
|
|
|
if (!parseBrace())
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
case tok::less:
|
|
|
|
if (parseAngle())
|
|
|
|
Tok->Type = TT_TemplateOpener;
|
|
|
|
else {
|
|
|
|
Tok->Type = TT_BinaryOperator;
|
|
|
|
CurrentToken = Tok;
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case tok::r_paren:
|
|
|
|
case tok::r_square:
|
|
|
|
return false;
|
|
|
|
case tok::r_brace:
|
|
|
|
// Lines can start with '}'.
|
|
|
|
if (Tok->Parent != NULL)
|
|
|
|
return false;
|
|
|
|
break;
|
|
|
|
case tok::greater:
|
|
|
|
Tok->Type = TT_BinaryOperator;
|
|
|
|
break;
|
|
|
|
case tok::kw_operator:
|
2013-02-11 16:01:18 +08:00
|
|
|
while (CurrentToken && CurrentToken->isNot(tok::l_paren)) {
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::star, tok::amp))
|
2013-02-11 16:01:18 +08:00
|
|
|
CurrentToken->Type = TT_PointerOrReference;
|
|
|
|
consumeToken();
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
2013-02-11 16:01:18 +08:00
|
|
|
if (CurrentToken)
|
|
|
|
CurrentToken->Type = TT_OverloadedOperatorLParen;
|
2013-01-30 05:01:14 +08:00
|
|
|
break;
|
|
|
|
case tok::question:
|
|
|
|
parseConditional();
|
|
|
|
break;
|
|
|
|
case tok::kw_template:
|
|
|
|
parseTemplateDeclaration();
|
|
|
|
break;
|
2013-02-11 23:32:15 +08:00
|
|
|
case tok::identifier:
|
|
|
|
if (Line.First.is(tok::kw_for) &&
|
|
|
|
Tok->FormatTok.Tok.getIdentifierInfo() == &Ident_in)
|
|
|
|
Tok->Type = TT_ObjCForIn;
|
|
|
|
break;
|
2013-01-30 05:01:14 +08:00
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
void parseIncludeDirective() {
|
|
|
|
next();
|
|
|
|
if (CurrentToken != NULL && CurrentToken->is(tok::less)) {
|
|
|
|
next();
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->isNot(tok::comment) ||
|
|
|
|
!CurrentToken->Children.empty())
|
|
|
|
CurrentToken->Type = TT_ImplicitStringLiteral;
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
while (CurrentToken != NULL) {
|
2013-02-23 15:46:38 +08:00
|
|
|
if (CurrentToken->is(tok::string_literal))
|
|
|
|
// Mark these string literals as "implicit" literals, too, so that
|
|
|
|
// they are not split or line-wrapped.
|
|
|
|
CurrentToken->Type = TT_ImplicitStringLiteral;
|
2013-01-30 05:01:14 +08:00
|
|
|
next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void parseWarningOrError() {
|
|
|
|
next();
|
|
|
|
// We still want to format the whitespace left of the first token of the
|
|
|
|
// warning or error.
|
|
|
|
next();
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
CurrentToken->Type = TT_ImplicitStringLiteral;
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void parsePreprocessorDirective() {
|
|
|
|
next();
|
|
|
|
if (CurrentToken == NULL)
|
|
|
|
return;
|
|
|
|
// Hashes in the middle of a line can lead to any strange token
|
|
|
|
// sequence.
|
|
|
|
if (CurrentToken->FormatTok.Tok.getIdentifierInfo() == NULL)
|
|
|
|
return;
|
|
|
|
switch (CurrentToken->FormatTok.Tok.getIdentifierInfo()->getPPKeywordID()) {
|
|
|
|
case tok::pp_include:
|
|
|
|
case tok::pp_import:
|
|
|
|
parseIncludeDirective();
|
|
|
|
break;
|
|
|
|
case tok::pp_error:
|
|
|
|
case tok::pp_warning:
|
|
|
|
parseWarningOrError();
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2013-02-05 17:34:14 +08:00
|
|
|
while (CurrentToken != NULL)
|
|
|
|
next();
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
public:
|
2013-01-30 05:01:14 +08:00
|
|
|
LineType parseLine() {
|
|
|
|
int PeriodsAndArrows = 0;
|
2013-03-02 00:48:32 +08:00
|
|
|
AnnotatedToken *LastPeriodOrArrow = NULL;
|
2013-01-30 05:01:14 +08:00
|
|
|
bool CanBeBuilderTypeStmt = true;
|
|
|
|
if (CurrentToken->is(tok::hash)) {
|
|
|
|
parsePreprocessorDirective();
|
|
|
|
return LT_PreprocessorDirective;
|
|
|
|
}
|
|
|
|
while (CurrentToken != NULL) {
|
|
|
|
if (CurrentToken->is(tok::kw_virtual))
|
|
|
|
KeywordVirtualFound = true;
|
2013-03-13 22:41:29 +08:00
|
|
|
if (CurrentToken->isOneOf(tok::period, tok::arrow)) {
|
2013-01-30 05:01:14 +08:00
|
|
|
++PeriodsAndArrows;
|
2013-03-02 00:48:32 +08:00
|
|
|
LastPeriodOrArrow = CurrentToken;
|
|
|
|
}
|
2013-02-16 04:33:06 +08:00
|
|
|
AnnotatedToken *TheToken = CurrentToken;
|
2013-01-30 05:01:14 +08:00
|
|
|
if (!consumeToken())
|
|
|
|
return LT_Invalid;
|
2013-02-16 04:33:06 +08:00
|
|
|
if (getPrecedence(*TheToken) > prec::Assignment &&
|
2013-02-18 21:52:06 +08:00
|
|
|
TheToken->Type == TT_BinaryOperator)
|
2013-02-16 04:33:06 +08:00
|
|
|
CanBeBuilderTypeStmt = false;
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
if (KeywordVirtualFound)
|
|
|
|
return LT_VirtualFunctionDecl;
|
|
|
|
|
|
|
|
// Assume a builder-type call if there are 2 or more "." and "->".
|
2013-03-02 00:48:32 +08:00
|
|
|
if (PeriodsAndArrows >= 2 && CanBeBuilderTypeStmt) {
|
|
|
|
LastPeriodOrArrow->LastInChainOfCalls = true;
|
2013-01-30 05:01:14 +08:00
|
|
|
return LT_BuilderTypeCall;
|
2013-03-02 00:48:32 +08:00
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
|
2013-02-05 18:07:47 +08:00
|
|
|
if (Line.First.Type == TT_ObjCMethodSpecifier) {
|
2013-02-06 18:05:46 +08:00
|
|
|
if (Contexts.back().FirstObjCSelectorName != NULL)
|
|
|
|
Contexts.back().FirstObjCSelectorName->LongestObjCSelectorName =
|
|
|
|
Contexts.back().LongestObjCSelectorName;
|
2013-02-05 18:07:47 +08:00
|
|
|
return LT_ObjCMethodDecl;
|
|
|
|
}
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
return LT_Other;
|
|
|
|
}
|
|
|
|
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
private:
|
2013-01-30 05:01:14 +08:00
|
|
|
void next() {
|
2013-02-04 15:21:18 +08:00
|
|
|
if (CurrentToken != NULL) {
|
|
|
|
determineTokenType(*CurrentToken);
|
2013-02-06 18:05:46 +08:00
|
|
|
CurrentToken->BindingStrength = Contexts.back().BindingStrength;
|
2013-02-04 15:21:18 +08:00
|
|
|
}
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
if (CurrentToken != NULL && !CurrentToken->Children.empty())
|
|
|
|
CurrentToken = &CurrentToken->Children[0];
|
|
|
|
else
|
|
|
|
CurrentToken = NULL;
|
2013-02-18 20:44:35 +08:00
|
|
|
|
|
|
|
// 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;
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
|
2013-02-06 18:05:46 +08:00
|
|
|
/// \brief A struct to hold information valid in a specific context, e.g.
|
|
|
|
/// a pair of parenthesis.
|
|
|
|
struct Context {
|
2013-03-14 21:45:21 +08:00
|
|
|
Context(tok::TokenKind ContextKind, unsigned BindingStrength,
|
|
|
|
bool IsExpression)
|
|
|
|
: ContextKind(ContextKind), BindingStrength(BindingStrength),
|
|
|
|
LongestObjCSelectorName(0), ColonIsForRangeExpr(false),
|
|
|
|
ColonIsObjCMethodExpr(false), FirstObjCSelectorName(NULL),
|
|
|
|
IsExpression(IsExpression), CanBeExpression(true) {}
|
|
|
|
|
|
|
|
tok::TokenKind ContextKind;
|
2013-02-06 18:05:46 +08:00
|
|
|
unsigned BindingStrength;
|
|
|
|
unsigned LongestObjCSelectorName;
|
|
|
|
bool ColonIsForRangeExpr;
|
|
|
|
bool ColonIsObjCMethodExpr;
|
|
|
|
AnnotatedToken *FirstObjCSelectorName;
|
|
|
|
bool IsExpression;
|
2013-03-13 15:49:51 +08:00
|
|
|
bool CanBeExpression;
|
2013-02-06 18:05:46 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/// \brief Puts a new \c Context onto the stack \c Contexts for the lifetime
|
|
|
|
/// of each instance.
|
|
|
|
struct ScopedContextCreator {
|
|
|
|
AnnotatingParser &P;
|
|
|
|
|
2013-03-14 21:45:21 +08:00
|
|
|
ScopedContextCreator(AnnotatingParser &P, tok::TokenKind ContextKind,
|
|
|
|
unsigned Increase)
|
|
|
|
: P(P) {
|
|
|
|
P.Contexts.push_back(
|
|
|
|
Context(ContextKind, P.Contexts.back().BindingStrength + Increase,
|
|
|
|
P.Contexts.back().IsExpression));
|
2013-02-06 18:05:46 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
~ScopedContextCreator() { P.Contexts.pop_back(); }
|
|
|
|
};
|
2013-02-04 15:21:18 +08:00
|
|
|
|
|
|
|
void determineTokenType(AnnotatedToken &Current) {
|
|
|
|
if (getPrecedence(Current) == prec::Assignment) {
|
2013-02-06 18:05:46 +08:00
|
|
|
Contexts.back().IsExpression = true;
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
for (AnnotatedToken *Previous = Current.Parent;
|
|
|
|
Previous && Previous->isNot(tok::comma);
|
|
|
|
Previous = Previous->Parent) {
|
2013-02-27 19:43:50 +08:00
|
|
|
if (Previous->is(tok::r_square))
|
|
|
|
Previous = Previous->MatchingParen;
|
2013-02-04 15:21:18 +08:00
|
|
|
if (Previous->Type == TT_BinaryOperator &&
|
2013-03-13 22:41:29 +08:00
|
|
|
Previous->isOneOf(tok::star, tok::amp)) {
|
2013-02-04 15:21:18 +08:00
|
|
|
Previous->Type = TT_PointerOrReference;
|
|
|
|
}
|
|
|
|
}
|
2013-03-13 22:41:29 +08:00
|
|
|
} else if (Current.isOneOf(tok::kw_return, tok::kw_throw) ||
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
(Current.is(tok::l_paren) && !Line.MustBeDeclaration &&
|
|
|
|
(!Current.Parent || Current.Parent->isNot(tok::kw_for)))) {
|
2013-02-06 18:05:46 +08:00
|
|
|
Contexts.back().IsExpression = true;
|
2013-03-13 22:41:29 +08:00
|
|
|
} else if (Current.isOneOf(tok::r_paren, tok::greater, tok::comma)) {
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
for (AnnotatedToken *Previous = Current.Parent;
|
2013-03-13 22:41:29 +08:00
|
|
|
Previous && Previous->isOneOf(tok::star, tok::amp);
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
Previous = Previous->Parent)
|
|
|
|
Previous->Type = TT_PointerOrReference;
|
2013-02-18 20:44:35 +08:00
|
|
|
} else if (Current.Parent &&
|
|
|
|
Current.Parent->Type == TT_CtorInitializerColon) {
|
|
|
|
Contexts.back().IsExpression = true;
|
2013-03-13 15:49:51 +08:00
|
|
|
} else if (Current.is(tok::kw_new)) {
|
|
|
|
Contexts.back().CanBeExpression = false;
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
}
|
2013-02-04 15:21:18 +08:00
|
|
|
|
|
|
|
if (Current.Type == TT_Unknown) {
|
Allow breaking between a type and name in variable declarations.
This fixes llvm.org/PR14967 and is generall necessary to avoid
situations where the column limit is exceeded. The challenge is
restricting such lines splits, otherwise clang-format suddenly starts
breaking at bad places.
Before:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string,
SomeOtherTemplateParameter> &ReallyReallyLongParameterName,
const SomeType<string,
SomeOtherTemplateParameter> &AnotherLongParameterName) {}
After:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string, SomeOtherTemplateParameter> &
ReallyReallyLongParameterName,
const SomeType<string, SomeOtherTemplateParameter> &
AnotherLongParameterName) {}
llvm-svn: 175999
2013-02-25 02:54:32 +08:00
|
|
|
if (Current.Parent && Current.is(tok::identifier) &&
|
|
|
|
((Current.Parent->is(tok::identifier) &&
|
|
|
|
Current.Parent->FormatTok.Tok.getIdentifierInfo()
|
|
|
|
->getPPKeywordID() == tok::pp_not_keyword) ||
|
|
|
|
Current.Parent->Type == TT_PointerOrReference ||
|
|
|
|
Current.Parent->Type == TT_TemplateCloser)) {
|
|
|
|
Current.Type = TT_StartOfName;
|
2013-03-13 22:41:29 +08:00
|
|
|
} else if (Current.isOneOf(tok::star, tok::amp, tok::ampamp)) {
|
2013-02-06 18:05:46 +08:00
|
|
|
Current.Type =
|
|
|
|
determineStarAmpUsage(Current, Contexts.back().IsExpression);
|
2013-03-13 22:41:29 +08:00
|
|
|
} else if (Current.isOneOf(tok::minus, tok::plus, tok::caret)) {
|
2013-02-04 15:21:18 +08:00
|
|
|
Current.Type = determinePlusMinusCaretUsage(Current);
|
2013-03-13 22:41:29 +08:00
|
|
|
} else if (Current.isOneOf(tok::minusminus, tok::plusplus)) {
|
2013-02-04 15:21:18 +08:00
|
|
|
Current.Type = determineIncrementUsage(Current);
|
|
|
|
} else if (Current.is(tok::exclaim)) {
|
|
|
|
Current.Type = TT_UnaryOperator;
|
|
|
|
} else if (isBinaryOperator(Current)) {
|
|
|
|
Current.Type = TT_BinaryOperator;
|
|
|
|
} else if (Current.is(tok::comment)) {
|
|
|
|
std::string Data(Lexer::getSpelling(Current.FormatTok.Tok, SourceMgr,
|
|
|
|
Lex.getLangOpts()));
|
|
|
|
if (StringRef(Data).startswith("//"))
|
|
|
|
Current.Type = TT_LineComment;
|
|
|
|
else
|
|
|
|
Current.Type = TT_BlockComment;
|
2013-02-13 12:13:13 +08:00
|
|
|
} else if (Current.is(tok::r_paren)) {
|
2013-02-20 04:05:41 +08:00
|
|
|
bool ParensNotExpr = !Current.Parent ||
|
|
|
|
Current.Parent->Type == TT_PointerOrReference ||
|
2013-02-13 12:13:13 +08:00
|
|
|
Current.Parent->Type == TT_TemplateCloser;
|
|
|
|
bool ParensCouldEndDecl =
|
2013-03-13 22:41:29 +08:00
|
|
|
!Current.Children.empty() &&
|
|
|
|
Current.Children[0].isOneOf(tok::equal, tok::semi, tok::l_brace);
|
2013-03-14 01:13:53 +08:00
|
|
|
bool IsSizeOfOrAlignOf =
|
|
|
|
Current.MatchingParen && Current.MatchingParen->Parent &&
|
|
|
|
Current.MatchingParen->Parent->isOneOf(tok::kw_sizeof,
|
|
|
|
tok::kw_alignof);
|
|
|
|
if (ParensNotExpr && !ParensCouldEndDecl && !IsSizeOfOrAlignOf &&
|
2013-02-23 16:07:18 +08:00
|
|
|
Contexts.back().IsExpression)
|
2013-02-13 12:13:13 +08:00
|
|
|
// FIXME: We need to get smarter and understand more cases of casts.
|
|
|
|
Current.Type = TT_CastRParen;
|
2013-02-04 15:21:18 +08:00
|
|
|
} else if (Current.is(tok::at) && Current.Children.size()) {
|
|
|
|
switch (Current.Children[0].FormatTok.Tok.getObjCKeywordID()) {
|
|
|
|
case tok::objc_interface:
|
|
|
|
case tok::objc_implementation:
|
|
|
|
case tok::objc_protocol:
|
|
|
|
Current.Type = TT_ObjCDecl;
|
|
|
|
break;
|
|
|
|
case tok::objc_property:
|
|
|
|
Current.Type = TT_ObjCProperty;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Return the type of the given token assuming it is * or &.
|
|
|
|
TokenType
|
|
|
|
determineStarAmpUsage(const AnnotatedToken &Tok, bool IsExpression) {
|
|
|
|
const AnnotatedToken *PrevToken = getPreviousToken(Tok);
|
|
|
|
if (PrevToken == NULL)
|
|
|
|
return TT_UnaryOperator;
|
|
|
|
|
|
|
|
const AnnotatedToken *NextToken = getNextToken(Tok);
|
|
|
|
if (NextToken == NULL)
|
|
|
|
return TT_Unknown;
|
|
|
|
|
2013-03-02 01:13:29 +08:00
|
|
|
if (PrevToken->is(tok::l_paren) && !IsExpression)
|
|
|
|
return TT_PointerOrReference;
|
|
|
|
|
2013-03-13 22:41:29 +08:00
|
|
|
if (PrevToken->isOneOf(tok::l_paren, tok::l_square, tok::l_brace,
|
2013-03-14 18:50:25 +08:00
|
|
|
tok::comma, tok::semi, tok::kw_return, tok::colon,
|
2013-03-13 22:41:29 +08:00
|
|
|
tok::equal) ||
|
|
|
|
PrevToken->Type == TT_BinaryOperator ||
|
2013-02-04 15:21:18 +08:00
|
|
|
PrevToken->Type == TT_UnaryOperator || PrevToken->Type == TT_CastRParen)
|
|
|
|
return TT_UnaryOperator;
|
|
|
|
|
2013-02-06 14:20:11 +08:00
|
|
|
if (NextToken->is(tok::l_square))
|
|
|
|
return TT_PointerOrReference;
|
|
|
|
|
2013-03-13 22:41:29 +08:00
|
|
|
if (PrevToken->FormatTok.Tok.isLiteral() ||
|
|
|
|
PrevToken->isOneOf(tok::r_paren, tok::r_square) ||
|
|
|
|
NextToken->FormatTok.Tok.isLiteral() || isUnaryOperator(*NextToken) ||
|
|
|
|
NextToken->isOneOf(tok::l_paren, tok::l_square))
|
2013-02-04 15:21:18 +08:00
|
|
|
return TT_BinaryOperator;
|
|
|
|
|
|
|
|
// It is very unlikely that we are going to find a pointer or reference type
|
|
|
|
// definition on the RHS of an assignment.
|
|
|
|
if (IsExpression)
|
|
|
|
return TT_BinaryOperator;
|
|
|
|
|
|
|
|
return TT_PointerOrReference;
|
|
|
|
}
|
|
|
|
|
|
|
|
TokenType determinePlusMinusCaretUsage(const AnnotatedToken &Tok) {
|
|
|
|
const AnnotatedToken *PrevToken = getPreviousToken(Tok);
|
|
|
|
if (PrevToken == NULL)
|
|
|
|
return TT_UnaryOperator;
|
|
|
|
|
|
|
|
// Use heuristics to recognize unary operators.
|
2013-03-13 22:41:29 +08:00
|
|
|
if (PrevToken->isOneOf(tok::equal, tok::l_paren, tok::comma, tok::l_square,
|
|
|
|
tok::question, tok::colon, tok::kw_return,
|
|
|
|
tok::kw_case, tok::at, tok::l_brace))
|
2013-02-04 15:21:18 +08:00
|
|
|
return TT_UnaryOperator;
|
|
|
|
|
2013-02-06 00:21:00 +08:00
|
|
|
// There can't be two consecutive binary operators.
|
2013-02-04 15:21:18 +08:00
|
|
|
if (PrevToken->Type == TT_BinaryOperator)
|
|
|
|
return TT_UnaryOperator;
|
|
|
|
|
|
|
|
// Fall back to marking the token as binary operator.
|
|
|
|
return TT_BinaryOperator;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// \brief Determine whether ++/-- are pre- or post-increments/-decrements.
|
|
|
|
TokenType determineIncrementUsage(const AnnotatedToken &Tok) {
|
|
|
|
const AnnotatedToken *PrevToken = getPreviousToken(Tok);
|
|
|
|
if (PrevToken == NULL)
|
|
|
|
return TT_UnaryOperator;
|
2013-03-13 22:41:29 +08:00
|
|
|
if (PrevToken->isOneOf(tok::r_paren, tok::r_square, tok::identifier))
|
2013-02-04 15:21:18 +08:00
|
|
|
return TT_TrailingUnaryOperator;
|
|
|
|
|
|
|
|
return TT_UnaryOperator;
|
|
|
|
}
|
2013-02-06 18:05:46 +08:00
|
|
|
|
|
|
|
SmallVector<Context, 8> Contexts;
|
|
|
|
|
|
|
|
SourceManager &SourceMgr;
|
|
|
|
Lexer &Lex;
|
|
|
|
AnnotatedLine &Line;
|
|
|
|
AnnotatedToken *CurrentToken;
|
|
|
|
bool KeywordVirtualFound;
|
2013-02-11 23:32:15 +08:00
|
|
|
IdentifierInfo &Ident_in;
|
2013-01-30 05:01:14 +08:00
|
|
|
};
|
|
|
|
|
2013-02-08 23:28:42 +08:00
|
|
|
/// \brief Parses binary expressions by inserting fake parenthesis based on
|
|
|
|
/// operator precedence.
|
|
|
|
class ExpressionParser {
|
|
|
|
public:
|
|
|
|
ExpressionParser(AnnotatedLine &Line) : Current(&Line.First) {}
|
|
|
|
|
|
|
|
/// \brief Parse expressions with the given operatore precedence.
|
2013-02-24 05:01:55 +08:00
|
|
|
void parse(int Precedence = 0) {
|
2013-02-08 23:28:42 +08:00
|
|
|
if (Precedence > prec::PointerToMember || Current == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Skip over "return" until we can properly parse it.
|
|
|
|
if (Current->is(tok::kw_return))
|
|
|
|
next();
|
|
|
|
|
|
|
|
// Eagerly consume trailing comments.
|
|
|
|
while (isTrailingComment(Current)) {
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
|
|
|
|
AnnotatedToken *Start = Current;
|
|
|
|
bool OperatorFound = false;
|
|
|
|
|
2013-02-24 05:01:55 +08:00
|
|
|
while (Current) {
|
2013-02-08 23:28:42 +08:00
|
|
|
// Consume operators with higher precedence.
|
2013-02-17 04:03:26 +08:00
|
|
|
parse(prec::Level(Precedence + 1));
|
2013-02-08 23:28:42 +08:00
|
|
|
|
2013-02-24 05:01:55 +08:00
|
|
|
int CurrentPrecedence = 0;
|
|
|
|
if (Current) {
|
|
|
|
if (Current->Type == TT_ConditionalExpr)
|
|
|
|
CurrentPrecedence = 1 + (int) prec::Conditional;
|
2013-03-14 21:45:21 +08:00
|
|
|
else if (Current->is(tok::semi) || Current->Type == TT_InlineASMColon ||
|
|
|
|
Current->Type == TT_CtorInitializerColon)
|
2013-02-24 05:01:55 +08:00
|
|
|
CurrentPrecedence = 1;
|
|
|
|
else if (Current->Type == TT_BinaryOperator || Current->is(tok::comma))
|
|
|
|
CurrentPrecedence = 1 + (int) getPrecedence(*Current);
|
|
|
|
}
|
|
|
|
|
2013-02-08 23:28:42 +08:00
|
|
|
// At the end of the line or when an operator with higher precedence is
|
|
|
|
// found, insert fake parenthesis and return.
|
2013-02-24 05:01:55 +08:00
|
|
|
if (Current == NULL || closesScope(*Current) ||
|
|
|
|
(CurrentPrecedence != 0 && CurrentPrecedence < Precedence)) {
|
2013-02-08 23:28:42 +08:00
|
|
|
if (OperatorFound) {
|
|
|
|
++Start->FakeLParens;
|
2013-02-24 05:01:55 +08:00
|
|
|
if (Current)
|
2013-02-09 00:49:27 +08:00
|
|
|
++Current->Parent->FakeRParens;
|
2013-02-08 23:28:42 +08:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Consume scopes: (), [], <> and {}
|
|
|
|
if (opensScope(*Current)) {
|
2013-02-24 05:01:55 +08:00
|
|
|
AnnotatedToken *Left = Current;
|
|
|
|
while (Current && !closesScope(*Current)) {
|
2013-02-08 23:28:42 +08:00
|
|
|
next();
|
|
|
|
parse();
|
|
|
|
}
|
2013-02-24 05:01:55 +08:00
|
|
|
// Remove fake parens that just duplicate the real parens.
|
|
|
|
if (Current && Left->Children[0].FakeLParens > 0 &&
|
|
|
|
Current->Parent->FakeRParens > 0) {
|
|
|
|
--Left->Children[0].FakeLParens;
|
|
|
|
--Current->Parent->FakeRParens;
|
|
|
|
}
|
2013-02-08 23:28:42 +08:00
|
|
|
next();
|
|
|
|
} else {
|
|
|
|
// Operator found.
|
2013-02-24 05:01:55 +08:00
|
|
|
if (CurrentPrecedence == Precedence)
|
2013-02-08 23:28:42 +08:00
|
|
|
OperatorFound = true;
|
|
|
|
|
|
|
|
next();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
void next() {
|
|
|
|
if (Current != NULL)
|
|
|
|
Current = Current->Children.empty() ? NULL : &Current->Children[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
AnnotatedToken *Current;
|
|
|
|
};
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
void TokenAnnotator::annotate(AnnotatedLine &Line) {
|
2013-02-11 23:32:15 +08:00
|
|
|
AnnotatingParser Parser(SourceMgr, Lex, Line, Ident_in);
|
2013-01-30 05:01:14 +08:00
|
|
|
Line.Type = Parser.parseLine();
|
|
|
|
if (Line.Type == LT_Invalid)
|
|
|
|
return;
|
|
|
|
|
2013-02-08 23:28:42 +08:00
|
|
|
ExpressionParser ExprParser(Line);
|
|
|
|
ExprParser.parse();
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Line.First.Type == TT_ObjCMethodSpecifier)
|
|
|
|
Line.Type = LT_ObjCMethodDecl;
|
|
|
|
else if (Line.First.Type == TT_ObjCDecl)
|
|
|
|
Line.Type = LT_ObjCDecl;
|
|
|
|
else if (Line.First.Type == TT_ObjCProperty)
|
|
|
|
Line.Type = LT_ObjCProperty;
|
|
|
|
|
2013-02-11 20:36:37 +08:00
|
|
|
Line.First.SpacesRequiredBefore = 1;
|
2013-01-30 05:01:14 +08:00
|
|
|
Line.First.MustBreakBefore = Line.First.FormatTok.MustBreakBefore;
|
|
|
|
Line.First.CanBreakBefore = Line.First.MustBreakBefore;
|
|
|
|
|
|
|
|
Line.First.TotalLength = Line.First.FormatTok.TokenLength;
|
|
|
|
}
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
void TokenAnnotator::calculateFormattingInformation(AnnotatedLine &Line) {
|
|
|
|
if (Line.First.Children.empty())
|
|
|
|
return;
|
|
|
|
AnnotatedToken *Current = &Line.First.Children[0];
|
|
|
|
while (Current != NULL) {
|
2013-02-11 20:36:37 +08:00
|
|
|
if (Current->Type == TT_LineComment)
|
|
|
|
Current->SpacesRequiredBefore = Style.SpacesBeforeTrailingComments;
|
|
|
|
else
|
|
|
|
Current->SpacesRequiredBefore =
|
|
|
|
spaceRequiredBefore(Line, *Current) ? 1 : 0;
|
2013-02-06 22:22:40 +08:00
|
|
|
|
|
|
|
if (Current->FormatTok.MustBreakBefore) {
|
|
|
|
Current->MustBreakBefore = true;
|
|
|
|
} else if (Current->Type == TT_LineComment) {
|
|
|
|
Current->MustBreakBefore = Current->FormatTok.NewlinesBefore > 0;
|
2013-02-08 23:28:42 +08:00
|
|
|
} else if (isTrailingComment(Current->Parent) ||
|
2013-02-06 22:22:40 +08:00
|
|
|
(Current->is(tok::string_literal) &&
|
|
|
|
Current->Parent->is(tok::string_literal))) {
|
|
|
|
Current->MustBreakBefore = true;
|
|
|
|
} else if (Current->is(tok::lessless) && !Current->Children.empty() &&
|
|
|
|
Current->Parent->is(tok::string_literal) &&
|
|
|
|
Current->Children[0].is(tok::string_literal)) {
|
|
|
|
Current->MustBreakBefore = true;
|
|
|
|
} else {
|
|
|
|
Current->MustBreakBefore = false;
|
|
|
|
}
|
|
|
|
Current->CanBreakBefore =
|
|
|
|
Current->MustBreakBefore || canBreakBefore(Line, *Current);
|
|
|
|
if (Current->MustBreakBefore)
|
|
|
|
Current->TotalLength = Current->Parent->TotalLength + Style.ColumnLimit;
|
|
|
|
else
|
|
|
|
Current->TotalLength =
|
|
|
|
Current->Parent->TotalLength + Current->FormatTok.TokenLength +
|
2013-02-11 20:36:37 +08:00
|
|
|
Current->SpacesRequiredBefore;
|
2013-02-06 22:22:40 +08:00
|
|
|
// FIXME: Only calculate this if CanBreakBefore is true once static
|
|
|
|
// initializers etc. are sorted out.
|
|
|
|
// FIXME: Move magic numbers to a better place.
|
|
|
|
Current->SplitPenalty =
|
|
|
|
20 * Current->BindingStrength + splitPenalty(Line, *Current);
|
|
|
|
|
|
|
|
Current = Current->Children.empty() ? NULL : &Current->Children[0];
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
|
|
|
|
const AnnotatedToken &Tok) {
|
2013-01-30 05:01:14 +08:00
|
|
|
const AnnotatedToken &Left = *Tok.Parent;
|
|
|
|
const AnnotatedToken &Right = Tok;
|
|
|
|
|
Allow breaking between a type and name in variable declarations.
This fixes llvm.org/PR14967 and is generall necessary to avoid
situations where the column limit is exceeded. The challenge is
restricting such lines splits, otherwise clang-format suddenly starts
breaking at bad places.
Before:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string,
SomeOtherTemplateParameter> &ReallyReallyLongParameterName,
const SomeType<string,
SomeOtherTemplateParameter> &AnotherLongParameterName) {}
After:
ReallyLongReturnType<TemplateParam1, TemplateParam2>
ReallyReallyLongFunctionName(
const std::string &SomeParameter,
const SomeType<string, SomeOtherTemplateParameter> &
ReallyReallyLongParameterName,
const SomeType<string, SomeOtherTemplateParameter> &
AnotherLongParameterName) {}
llvm-svn: 175999
2013-02-25 02:54:32 +08:00
|
|
|
if (Right.Type == TT_StartOfName) {
|
|
|
|
if (Line.First.is(tok::kw_for))
|
|
|
|
return 3;
|
|
|
|
else if (Line.MightBeFunctionDecl && Right.BindingStrength == 1)
|
|
|
|
// FIXME: Clean up hack of using BindingStrength to find top-level names.
|
|
|
|
return Style.PenaltyReturnTypeOnItsOwnLine;
|
|
|
|
else
|
|
|
|
return 100;
|
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Left.is(tok::equal) && Right.is(tok::l_brace))
|
|
|
|
return 150;
|
|
|
|
if (Left.is(tok::coloncolon))
|
|
|
|
return 500;
|
|
|
|
|
2013-02-14 16:42:54 +08:00
|
|
|
if (Left.Type == TT_RangeBasedForLoopColon ||
|
|
|
|
Left.Type == TT_InheritanceColon)
|
2013-02-26 21:18:08 +08:00
|
|
|
return 2;
|
2013-01-30 05:01:14 +08:00
|
|
|
|
2013-03-13 22:41:29 +08:00
|
|
|
if (Right.isOneOf(tok::arrow, tok::period)) {
|
2013-02-18 21:24:21 +08:00
|
|
|
if (Line.Type == LT_BuilderTypeCall)
|
2013-03-14 01:13:53 +08:00
|
|
|
return prec::PointerToMember;
|
2013-03-13 22:41:29 +08:00
|
|
|
if (Left.isOneOf(tok::r_paren, tok::r_square) && Left.MatchingParen &&
|
|
|
|
Left.MatchingParen->ParameterCount > 0)
|
2013-02-26 21:59:14 +08:00
|
|
|
return 20; // Should be smaller than breaking at a nested comma.
|
2013-01-30 05:01:14 +08:00
|
|
|
return 150;
|
|
|
|
}
|
|
|
|
|
|
|
|
// In for-loops, prefer breaking at ',' and ';'.
|
Allow breaking between type and name in for loops.
This fixes llvm.org/PR15033.
Also: Always break before a parameter, if the previous parameter was
split over multiple lines. This was necessary to make the right
decisions in for-loops, almost always makes the code more readable and
also fixes llvm.org/PR14873.
Before:
for (llvm::ArrayRef<NamedDecl *>::iterator I = FD->getDeclsInPrototypeScope()
.begin(), E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc), d, bar(e, f));
After:
for (llvm::ArrayRef<NamedDecl *>::iterator
I = FD->getDeclsInPrototypeScope().begin(),
E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc),
d, bar(e, f));
llvm-svn: 175741
2013-02-21 23:00:29 +08:00
|
|
|
if (Line.First.is(tok::kw_for) && Left.is(tok::equal))
|
|
|
|
return 4;
|
2013-01-30 05:01:14 +08:00
|
|
|
|
2013-02-04 15:30:30 +08:00
|
|
|
if (Left.is(tok::semi))
|
2013-01-30 05:01:14 +08:00
|
|
|
return 0;
|
2013-02-04 15:30:30 +08:00
|
|
|
if (Left.is(tok::comma))
|
|
|
|
return 1;
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
// In Objective-C method expressions, prefer breaking before "param:" over
|
|
|
|
// breaking after it.
|
2013-02-05 18:07:47 +08:00
|
|
|
if (Right.Type == TT_ObjCSelectorName)
|
2013-01-30 05:01:14 +08:00
|
|
|
return 0;
|
2013-02-05 18:07:47 +08:00
|
|
|
if (Left.is(tok::colon) && Left.Type == TT_ObjCMethodExpr)
|
2013-01-30 05:01:14 +08:00
|
|
|
return 20;
|
|
|
|
|
2013-03-13 22:41:29 +08:00
|
|
|
if (opensScope(Left))
|
2013-01-30 05:01:14 +08:00
|
|
|
return 20;
|
|
|
|
|
2013-02-07 05:04:05 +08:00
|
|
|
if (Right.is(tok::lessless)) {
|
|
|
|
if (Left.is(tok::string_literal)) {
|
2013-03-14 22:00:17 +08:00
|
|
|
StringRef Content = StringRef(Left.FormatTok.Tok.getLiteralData(),
|
|
|
|
Left.FormatTok.TokenLength);
|
|
|
|
Content = Content.drop_back(1).drop_front(1).trim();
|
|
|
|
if (Content.size() > 1 &&
|
|
|
|
(Content.back() == ':' || Content.back() == '='))
|
2013-02-07 05:04:05 +08:00
|
|
|
return 100;
|
|
|
|
}
|
2013-02-04 15:21:18 +08:00
|
|
|
return prec::Shift;
|
2013-02-07 05:04:05 +08:00
|
|
|
}
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Left.Type == TT_ConditionalExpr)
|
2013-02-26 21:59:14 +08:00
|
|
|
return prec::Conditional;
|
2013-01-30 05:01:14 +08:00
|
|
|
prec::Level Level = getPrecedence(Left);
|
|
|
|
|
|
|
|
if (Level != prec::Unknown)
|
|
|
|
return Level;
|
2013-03-02 00:48:32 +08:00
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
return 3;
|
|
|
|
}
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
|
|
|
|
const AnnotatedToken &Left,
|
2013-01-30 05:01:14 +08:00
|
|
|
const AnnotatedToken &Right) {
|
|
|
|
if (Right.is(tok::hashhash))
|
|
|
|
return Left.is(tok::hash);
|
2013-03-13 22:41:29 +08:00
|
|
|
if (Left.isOneOf(tok::hashhash, tok::hash))
|
2013-01-30 05:01:14 +08:00
|
|
|
return Right.is(tok::hash);
|
2013-03-13 22:41:29 +08:00
|
|
|
if (Right.isOneOf(tok::r_paren, tok::semi, tok::comma))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
|
|
|
if (Right.is(tok::less) &&
|
|
|
|
(Left.is(tok::kw_template) ||
|
|
|
|
(Line.Type == LT_ObjCDecl && Style.ObjCSpaceBeforeProtocolList)))
|
|
|
|
return true;
|
|
|
|
if (Left.is(tok::arrow) || Right.is(tok::arrow))
|
|
|
|
return false;
|
2013-03-13 22:41:29 +08:00
|
|
|
if (Left.isOneOf(tok::exclaim, tok::tilde))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
|
|
|
if (Left.is(tok::at) &&
|
2013-03-13 22:41:29 +08:00
|
|
|
Right.isOneOf(tok::identifier, tok::string_literal, tok::char_constant,
|
|
|
|
tok::numeric_constant, tok::l_paren, tok::l_brace,
|
|
|
|
tok::kw_true, tok::kw_false))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
|
|
|
if (Left.is(tok::coloncolon))
|
|
|
|
return false;
|
|
|
|
if (Right.is(tok::coloncolon))
|
2013-03-13 22:41:29 +08:00
|
|
|
return !Left.isOneOf(tok::identifier, tok::greater, tok::l_paren);
|
|
|
|
if (Left.is(tok::less) || Right.isOneOf(tok::greater, tok::less))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-03-13 00:28:18 +08:00
|
|
|
if (Right.Type == TT_PointerOrReference)
|
2013-01-30 05:01:14 +08:00
|
|
|
return Left.FormatTok.Tok.isLiteral() ||
|
2013-03-13 00:28:18 +08:00
|
|
|
((Left.Type != TT_PointerOrReference) && Left.isNot(tok::l_paren) &&
|
|
|
|
!Style.PointerBindsToType);
|
|
|
|
if (Left.Type == TT_PointerOrReference)
|
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
llvm-svn: 174975
2013-02-13 00:17:07 +08:00
|
|
|
return Right.FormatTok.Tok.isLiteral() ||
|
2013-03-13 00:28:18 +08:00
|
|
|
((Right.Type != TT_PointerOrReference) && Style.PointerBindsToType);
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Right.is(tok::star) && Left.is(tok::l_paren))
|
|
|
|
return false;
|
2013-02-10 10:08:05 +08:00
|
|
|
if (Left.is(tok::l_square))
|
|
|
|
return Left.Type == TT_ObjCArrayLiteral && Right.isNot(tok::r_square);
|
|
|
|
if (Right.is(tok::r_square))
|
|
|
|
return Right.Type == TT_ObjCArrayLiteral;
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Right.is(tok::l_square) && Right.Type != TT_ObjCMethodExpr)
|
|
|
|
return false;
|
|
|
|
if (Left.is(tok::period) || Right.is(tok::period))
|
|
|
|
return false;
|
|
|
|
if (Left.is(tok::colon))
|
|
|
|
return Left.Type != TT_ObjCMethodExpr;
|
|
|
|
if (Right.is(tok::colon))
|
|
|
|
return Right.Type != TT_ObjCMethodExpr;
|
|
|
|
if (Left.is(tok::l_paren))
|
|
|
|
return false;
|
|
|
|
if (Right.is(tok::l_paren)) {
|
2013-03-13 22:41:29 +08:00
|
|
|
return Line.Type == LT_ObjCDecl ||
|
|
|
|
Left.isOneOf(tok::kw_if, tok::kw_for, tok::kw_while, tok::kw_switch,
|
|
|
|
tok::kw_return, tok::kw_catch, tok::kw_new,
|
|
|
|
tok::kw_delete);
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
if (Left.is(tok::at) &&
|
|
|
|
Right.FormatTok.Tok.getObjCKeywordID() != tok::objc_not_keyword)
|
|
|
|
return false;
|
|
|
|
if (Left.is(tok::l_brace) && Right.is(tok::r_brace))
|
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
|
|
|
|
const AnnotatedToken &Tok) {
|
2013-02-11 16:01:18 +08:00
|
|
|
if (Tok.FormatTok.Tok.getIdentifierInfo() &&
|
|
|
|
Tok.Parent->FormatTok.Tok.getIdentifierInfo())
|
|
|
|
return true; // Never ever merge two identifiers.
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Line.Type == LT_ObjCMethodDecl) {
|
|
|
|
if (Tok.Parent->Type == TT_ObjCMethodSpecifier)
|
|
|
|
return true;
|
|
|
|
if (Tok.Parent->is(tok::r_paren) && Tok.is(tok::identifier))
|
|
|
|
// Don't space between ')' and <id>
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
if (Line.Type == LT_ObjCProperty &&
|
|
|
|
(Tok.is(tok::equal) || Tok.Parent->is(tok::equal)))
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (Tok.Parent->is(tok::comma))
|
|
|
|
return true;
|
2013-02-28 21:40:17 +08:00
|
|
|
if (Tok.is(tok::comma))
|
|
|
|
return false;
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Tok.Type == TT_CtorInitializerColon || Tok.Type == TT_ObjCBlockLParen)
|
|
|
|
return true;
|
2013-02-11 16:01:18 +08:00
|
|
|
if (Tok.Parent->FormatTok.Tok.is(tok::kw_operator))
|
|
|
|
return false;
|
|
|
|
if (Tok.Type == TT_OverloadedOperatorLParen)
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
|
|
|
if (Tok.is(tok::colon))
|
2013-03-13 22:41:29 +08:00
|
|
|
return !Line.First.isOneOf(tok::kw_case, tok::kw_default) &&
|
|
|
|
!Tok.Children.empty() && Tok.Type != TT_ObjCMethodExpr;
|
2013-03-02 01:13:29 +08:00
|
|
|
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))
|
|
|
|
return true;
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Tok.Parent->Type == TT_UnaryOperator || Tok.Parent->Type == TT_CastRParen)
|
|
|
|
return false;
|
|
|
|
if (Tok.Type == TT_UnaryOperator)
|
2013-03-13 22:41:29 +08:00
|
|
|
return !Tok.Parent->isOneOf(tok::l_paren, tok::l_square, tok::at) &&
|
2013-01-30 05:01:14 +08:00
|
|
|
(Tok.Parent->isNot(tok::colon) ||
|
|
|
|
Tok.Parent->Type != TT_ObjCMethodExpr);
|
|
|
|
if (Tok.Parent->is(tok::greater) && Tok.is(tok::greater)) {
|
2013-02-08 23:28:42 +08:00
|
|
|
return Tok.Type == TT_TemplateCloser &&
|
|
|
|
Tok.Parent->Type == TT_TemplateCloser &&
|
|
|
|
Style.Standard != FormatStyle::LS_Cpp11;
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
2013-02-28 21:40:17 +08:00
|
|
|
if (Tok.is(tok::arrowstar) || Tok.Parent->is(tok::arrowstar))
|
|
|
|
return false;
|
|
|
|
if (Tok.Type == TT_BinaryOperator || Tok.Parent->Type == TT_BinaryOperator)
|
2013-01-30 05:01:14 +08:00
|
|
|
return true;
|
|
|
|
if (Tok.Parent->Type == TT_TemplateCloser && Tok.is(tok::l_paren))
|
|
|
|
return false;
|
|
|
|
if (Tok.is(tok::less) && Line.First.is(tok::hash))
|
|
|
|
return true;
|
|
|
|
if (Tok.Type == TT_TrailingUnaryOperator)
|
|
|
|
return false;
|
2013-02-06 22:22:40 +08:00
|
|
|
return spaceRequiredBetween(Line, *Tok.Parent, Tok);
|
2013-01-30 05:01:14 +08:00
|
|
|
}
|
|
|
|
|
2013-02-06 22:22:40 +08:00
|
|
|
bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
|
|
|
|
const AnnotatedToken &Right) {
|
2013-01-30 05:01:14 +08:00
|
|
|
const AnnotatedToken &Left = *Right.Parent;
|
2013-02-14 04:33:44 +08:00
|
|
|
if (Right.Type == TT_StartOfName)
|
2013-01-30 05:01:14 +08:00
|
|
|
return true;
|
|
|
|
if (Right.is(tok::colon) && Right.Type == TT_ObjCMethodExpr)
|
|
|
|
return false;
|
|
|
|
if (Left.is(tok::colon) && Left.Type == TT_ObjCMethodExpr)
|
|
|
|
return true;
|
2013-02-05 18:07:47 +08:00
|
|
|
if (Right.Type == TT_ObjCSelectorName)
|
2013-01-30 05:01:14 +08:00
|
|
|
return true;
|
|
|
|
if (Left.ClosesTemplateDeclaration)
|
|
|
|
return true;
|
|
|
|
if (Right.Type == TT_ConditionalExpr || Right.is(tok::question))
|
|
|
|
return true;
|
2013-02-14 16:42:54 +08:00
|
|
|
if (Right.Type == TT_RangeBasedForLoopColon ||
|
|
|
|
Right.Type == TT_InheritanceColon)
|
|
|
|
return false;
|
|
|
|
if (Left.Type == TT_RangeBasedForLoopColon ||
|
|
|
|
Left.Type == TT_InheritanceColon)
|
2013-01-30 05:01:14 +08:00
|
|
|
return true;
|
Allow breaking between type and name in for loops.
This fixes llvm.org/PR15033.
Also: Always break before a parameter, if the previous parameter was
split over multiple lines. This was necessary to make the right
decisions in for-loops, almost always makes the code more readable and
also fixes llvm.org/PR14873.
Before:
for (llvm::ArrayRef<NamedDecl *>::iterator I = FD->getDeclsInPrototypeScope()
.begin(), E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc), d, bar(e, f));
After:
for (llvm::ArrayRef<NamedDecl *>::iterator
I = FD->getDeclsInPrototypeScope().begin(),
E = FD->getDeclsInPrototypeScope().end();
I != E; ++I) {
}
foo(bar(bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,
ccccccccccccccccccccccccccccc),
d, bar(e, f));
llvm-svn: 175741
2013-02-21 23:00:29 +08:00
|
|
|
if (Right.Type == TT_RangeBasedForLoopColon)
|
|
|
|
return false;
|
2013-01-30 05:01:14 +08:00
|
|
|
if (Left.Type == TT_PointerOrReference || Left.Type == TT_TemplateCloser ||
|
|
|
|
Left.Type == TT_UnaryOperator || Left.Type == TT_ConditionalExpr ||
|
2013-03-13 22:41:29 +08:00
|
|
|
Left.isOneOf(tok::question, tok::kw_operator))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
|
|
|
if (Left.is(tok::equal) && Line.Type == LT_VirtualFunctionDecl)
|
|
|
|
return false;
|
2013-02-28 22:44:25 +08:00
|
|
|
if (Left.is(tok::l_paren) && Right.is(tok::l_paren) && Left.Parent &&
|
|
|
|
Left.Parent->is(tok::kw___attribute))
|
|
|
|
return false;
|
2013-01-30 05:01:14 +08:00
|
|
|
|
|
|
|
if (Right.Type == TT_LineComment)
|
|
|
|
// We rely on MustBreakBefore being set correctly here as we should not
|
|
|
|
// change the "binding" behavior of a comment.
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Allow breaking after a trailing 'const', e.g. after a method declaration,
|
|
|
|
// unless it is follow by ';', '{' or '='.
|
|
|
|
if (Left.is(tok::kw_const) && Left.Parent != NULL &&
|
|
|
|
Left.Parent->is(tok::r_paren))
|
2013-03-13 22:41:29 +08:00
|
|
|
return !Right.isOneOf(tok::l_brace, tok::semi, tok::equal);
|
2013-01-30 05:01:14 +08:00
|
|
|
|
2013-03-14 17:50:46 +08:00
|
|
|
if (Right.is(tok::kw___attribute))
|
|
|
|
return true;
|
|
|
|
|
2013-01-30 05:01:14 +08:00
|
|
|
// We only break before r_brace if there was a corresponding break before
|
|
|
|
// the l_brace, which is tracked by BreakBeforeClosingBrace.
|
2013-03-14 17:50:46 +08:00
|
|
|
if (Right.isOneOf(tok::r_brace, tok::r_paren, tok::greater))
|
2013-01-30 05:01:14 +08:00
|
|
|
return false;
|
2013-02-23 15:46:38 +08:00
|
|
|
if (Left.is(tok::identifier) && Right.is(tok::string_literal))
|
|
|
|
return true;
|
2013-01-30 05:01:14 +08:00
|
|
|
return (isBinaryOperator(Left) && Left.isNot(tok::lessless)) ||
|
2013-03-13 22:41:29 +08:00
|
|
|
Left.isOneOf(tok::comma, tok::coloncolon, tok::semi, tok::l_brace) ||
|
|
|
|
Right.isOneOf(tok::lessless, tok::arrow, tok::period, tok::colon) ||
|
2013-01-30 05:01:14 +08:00
|
|
|
(Left.is(tok::r_paren) && Left.Type != TT_CastRParen &&
|
2013-03-13 22:41:29 +08:00
|
|
|
Right.isOneOf(tok::identifier, tok::kw___attribute)) ||
|
2013-01-30 05:01:14 +08:00
|
|
|
(Left.is(tok::l_paren) && !Right.is(tok::r_paren)) ||
|
|
|
|
(Left.is(tok::l_square) && !Right.is(tok::r_square));
|
|
|
|
}
|
|
|
|
|
|
|
|
} // namespace format
|
|
|
|
} // namespace clang
|