[clang] fee4a97 - [clang-format] Use FormatToken::is* functions without passing through `Tok`. NFC.
Marek Kurdej via cfe-commits
cfe-commits at lists.llvm.org
Tue Feb 22 07:52:51 PST 2022
Author: Marek Kurdej
Date: 2022-02-22T16:41:15+01:00
New Revision: fee4a9712f58caa9f1c3fc6c76ac46c5407475b6
URL: https://github.com/llvm/llvm-project/commit/fee4a9712f58caa9f1c3fc6c76ac46c5407475b6
DIFF: https://github.com/llvm/llvm-project/commit/fee4a9712f58caa9f1c3fc6c76ac46c5407475b6.diff
LOG: [clang-format] Use FormatToken::is* functions without passing through `Tok`. NFC.
Added:
Modified:
clang/lib/Format/ContinuationIndenter.cpp
clang/lib/Format/FormatTokenLexer.cpp
clang/lib/Format/TokenAnnotator.cpp
clang/lib/Format/UnwrappedLineParser.cpp
Removed:
################################################################################
diff --git a/clang/lib/Format/ContinuationIndenter.cpp b/clang/lib/Format/ContinuationIndenter.cpp
index ec268e74fd97..62e0d01871e8 100644
--- a/clang/lib/Format/ContinuationIndenter.cpp
+++ b/clang/lib/Format/ContinuationIndenter.cpp
@@ -1634,7 +1634,7 @@ void ContinuationIndenter::moveStatePastScopeOpener(LineState &State,
NewState.HasMultipleNestedBlocks = (Current.BlockParameterCount > 1);
if (Style.BraceWrapping.BeforeLambdaBody && Current.Next != nullptr &&
- Current.Tok.is(tok::l_paren)) {
+ Current.is(tok::l_paren)) {
// Search for any parameter that is a lambda
FormatToken const *next = Current.Next;
while (next != nullptr) {
diff --git a/clang/lib/Format/FormatTokenLexer.cpp b/clang/lib/Format/FormatTokenLexer.cpp
index 1540c14686fa..a48db4ef6d90 100644
--- a/clang/lib/Format/FormatTokenLexer.cpp
+++ b/clang/lib/Format/FormatTokenLexer.cpp
@@ -91,7 +91,7 @@ ArrayRef<FormatToken *> FormatTokenLexer::lex() {
handleCSharpVerbatimAndInterpolatedStrings();
if (Tokens.back()->NewlinesBefore > 0 || Tokens.back()->IsMultiline)
FirstInLineIndex = Tokens.size() - 1;
- } while (Tokens.back()->Tok.isNot(tok::eof));
+ } while (Tokens.back()->isNot(tok::eof));
return Tokens;
}
@@ -851,7 +851,7 @@ FormatToken *FormatTokenLexer::getNextToken() {
// Consume and record whitespace until we find a significant token.
unsigned WhitespaceLength = TrailingWhitespace;
- while (FormatTok->Tok.is(tok::unknown)) {
+ while (FormatTok->is(tok::unknown)) {
StringRef Text = FormatTok->TokenText;
auto EscapesNewline = [&](int pos) {
// A '\r' here is just part of '\r\n'. Skip it.
@@ -965,12 +965,12 @@ FormatToken *FormatTokenLexer::getNextToken() {
FormatTok->OriginalColumn = Column;
TrailingWhitespace = 0;
- if (FormatTok->Tok.is(tok::comment)) {
+ if (FormatTok->is(tok::comment)) {
// FIXME: Add the trimmed whitespace to Column.
StringRef UntrimmedText = FormatTok->TokenText;
FormatTok->TokenText = FormatTok->TokenText.rtrim(" \t\v\f");
TrailingWhitespace = UntrimmedText.size() - FormatTok->TokenText.size();
- } else if (FormatTok->Tok.is(tok::raw_identifier)) {
+ } else if (FormatTok->is(tok::raw_identifier)) {
IdentifierInfo &Info = IdentTable.get(FormatTok->TokenText);
FormatTok->Tok.setIdentifierInfo(&Info);
FormatTok->Tok.setKind(Info.getTokenID());
@@ -985,12 +985,12 @@ FormatToken *FormatTokenLexer::getNextToken() {
FormatTok->Tok.setKind(tok::identifier);
FormatTok->Tok.setIdentifierInfo(nullptr);
}
- } else if (FormatTok->Tok.is(tok::greatergreater)) {
+ } else if (FormatTok->is(tok::greatergreater)) {
FormatTok->Tok.setKind(tok::greater);
FormatTok->TokenText = FormatTok->TokenText.substr(0, 1);
++Column;
StateStack.push(LexerState::TOKEN_STASHED);
- } else if (FormatTok->Tok.is(tok::lessless)) {
+ } else if (FormatTok->is(tok::lessless)) {
FormatTok->Tok.setKind(tok::less);
FormatTok->TokenText = FormatTok->TokenText.substr(0, 1);
++Column;
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 9a020eb6ca7d..7649263a18a1 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -114,7 +114,7 @@ class AnnotatingParser {
// If there's a template keyword before the opening angle bracket, this is a
// template parameter, not an argument.
Contexts.back().InTemplateArgument =
- Left->Previous && Left->Previous->Tok.isNot(tok::kw_template);
+ Left->Previous && Left->Previous->isNot(tok::kw_template);
if (Style.Language == FormatStyle::LK_Java &&
CurrentToken->is(tok::question))
@@ -1266,7 +1266,7 @@ class AnnotatingParser {
return LT_ImportStatement;
}
- if (CurrentToken->Tok.is(tok::numeric_constant)) {
+ if (CurrentToken->is(tok::numeric_constant)) {
CurrentToken->SpacesRequiredBefore = 1;
return Type;
}
@@ -1743,7 +1743,7 @@ class AnnotatingParser {
tok::coloncolon))
if (FormatToken *AfterParen = Current.MatchingParen->Next) {
// Make sure this isn't the return type of an Obj-C block declaration
- if (AfterParen->Tok.isNot(tok::caret)) {
+ if (AfterParen->isNot(tok::caret)) {
if (FormatToken *BeforeParen = Current.MatchingParen->Previous)
if (BeforeParen->is(tok::identifier) &&
!BeforeParen->is(TT_TypenameMacro) &&
@@ -3564,7 +3564,7 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
// (e.g. as "const x of y" in a for loop), or after a destructuring
// operation (const [x, y] of z, const {a, b} of c).
(Left.is(Keywords.kw_of) && Left.Previous &&
- (Left.Previous->Tok.is(tok::identifier) ||
+ (Left.Previous->is(tok::identifier) ||
Left.Previous->isOneOf(tok::r_square, tok::r_brace)))) &&
(!Left.Previous || !Left.Previous->is(tok::period)))
return true;
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 09e209e85654..35465bf9a85b 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -589,7 +589,7 @@ void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) {
// update information about whether an lbrace starts a
// braced init list or a
diff erent block during the loop.
SmallVector<FormatToken *, 8> LBraceStack;
- assert(Tok->Tok.is(tok::l_brace));
+ assert(Tok->is(tok::l_brace));
do {
// Get next non-comment token.
FormatToken *NextTok;
@@ -723,7 +723,7 @@ void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) {
}
PrevTok = Tok;
Tok = NextTok;
- } while (Tok->Tok.isNot(tok::eof) && !LBraceStack.empty());
+ } while (Tok->isNot(tok::eof) && !LBraceStack.empty());
// Assume other blocks for all unclosed opening braces.
for (FormatToken *LBrace : LBraceStack)
@@ -835,7 +835,7 @@ UnwrappedLineParser::parseBlock(bool MustBeDeclaration, unsigned AddLevels,
parseStructuralElement();
}
- if (MunchSemi && FormatTok->Tok.is(tok::semi))
+ if (MunchSemi && FormatTok->is(tok::semi))
nextToken();
Line->Level = InitialLevel;
@@ -923,7 +923,7 @@ void UnwrappedLineParser::parseChildBlock(
}
void UnwrappedLineParser::parsePPDirective() {
- assert(FormatTok->Tok.is(tok::hash) && "'#' expected");
+ assert(FormatTok->is(tok::hash) && "'#' expected");
ScopedMacroState MacroState(*Line, Tokens, FormatTok);
nextToken();
@@ -1402,9 +1402,9 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
return;
case tok::kw_extern:
nextToken();
- if (FormatTok->Tok.is(tok::string_literal)) {
+ if (FormatTok->is(tok::string_literal)) {
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.AfterExternBlock)
addUnwrappedLine();
// Either we indent or for backwards compatibility we follow the
@@ -1433,7 +1433,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
LLVM_FALLTHROUGH;
case tok::kw_inline:
nextToken();
- if (FormatTok->Tok.is(tok::kw_namespace)) {
+ if (FormatTok->is(tok::kw_namespace)) {
parseNamespace();
return;
}
@@ -1498,7 +1498,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
switch (FormatTok->Tok.getKind()) {
case tok::at:
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
nextToken();
parseBracedList();
break;
@@ -1529,7 +1529,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
return;
case tok::objc_autoreleasepool:
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always)
addUnwrappedLine();
@@ -1539,10 +1539,10 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
return;
case tok::objc_synchronized:
nextToken();
- if (FormatTok->Tok.is(tok::l_paren))
+ if (FormatTok->is(tok::l_paren))
// Skip synchronization object
parseParens();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always)
addUnwrappedLine();
@@ -1751,7 +1751,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
TokenCount = Line->Tokens.size();
if (TokenCount == 1 ||
(TokenCount == 2 && Line->Tokens.front().Tok->is(tok::comment))) {
- if (FormatTok->Tok.is(tok::colon) && !Line->MustBeDeclaration) {
+ if (FormatTok->is(tok::colon) && !Line->MustBeDeclaration) {
Line->Tokens.begin()->Tok->MustBreakBefore = true;
parseLabel(!Style.IndentGotoLabels);
return;
@@ -1784,7 +1784,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
}
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
// Block kind should probably be set to BK_BracedInit for any language.
// C# needs this change to ensure that array initialisers and object
// initialisers are indented the same way.
@@ -1793,7 +1793,7 @@ void UnwrappedLineParser::parseStructuralElement(IfStmtKind *IfKind,
nextToken();
parseBracedList();
} else if (Style.Language == FormatStyle::LK_Proto &&
- FormatTok->Tok.is(tok::less)) {
+ FormatTok->is(tok::less)) {
nextToken();
parseBracedList(/*ContinueOnSemicolons=*/false, /*IsEnum=*/false,
/*ClosingBraceKind=*/tok::greater);
@@ -2185,7 +2185,7 @@ bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons,
/// \param AmpAmpTokenType If
diff erent than TT_Unknown sets this type for all
/// double ampersands. This only counts for the current parens scope.
void UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
- assert(FormatTok->Tok.is(tok::l_paren) && "'(' expected.");
+ assert(FormatTok->is(tok::l_paren) && "'(' expected.");
nextToken();
do {
switch (FormatTok->Tok.getKind()) {
@@ -2209,7 +2209,7 @@ void UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
break;
case tok::at:
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
nextToken();
parseBracedList();
}
@@ -2253,7 +2253,7 @@ void UnwrappedLineParser::parseParens(TokenType AmpAmpTokenType) {
void UnwrappedLineParser::parseSquare(bool LambdaIntroducer) {
if (!LambdaIntroducer) {
- assert(FormatTok->Tok.is(tok::l_square) && "'[' expected.");
+ assert(FormatTok->is(tok::l_square) && "'[' expected.");
if (tryToParseLambda())
return;
}
@@ -2278,7 +2278,7 @@ void UnwrappedLineParser::parseSquare(bool LambdaIntroducer) {
}
case tok::at:
nextToken();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
nextToken();
parseBracedList();
}
@@ -2379,11 +2379,11 @@ FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind,
parseSquare();
};
- assert(FormatTok->Tok.is(tok::kw_if) && "'if' expected");
+ assert(FormatTok->is(tok::kw_if) && "'if' expected");
nextToken();
- if (FormatTok->Tok.isOneOf(tok::kw_constexpr, tok::identifier))
+ if (FormatTok->isOneOf(tok::kw_constexpr, tok::identifier))
nextToken();
- if (FormatTok->Tok.is(tok::l_paren))
+ if (FormatTok->is(tok::l_paren))
parseParens();
HandleAttributes();
@@ -2393,7 +2393,7 @@ FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind,
FormatToken *IfLeftBrace = nullptr;
IfStmtKind IfBlockKind = IfStmtKind::NotIf;
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
IfLeftBrace = FormatTok;
CompoundStatementIndenter Indenter(this, Style, Line->Level);
IfBlockKind = parseBlock();
@@ -2416,20 +2416,20 @@ FormatToken *UnwrappedLineParser::parseIfThenElse(IfStmtKind *IfKind,
FormatToken *ElseLeftBrace = nullptr;
IfStmtKind Kind = IfStmtKind::IfOnly;
- if (FormatTok->Tok.is(tok::kw_else)) {
+ if (FormatTok->is(tok::kw_else)) {
if (Style.RemoveBracesLLVM) {
NestedTooDeep.back() = false;
Kind = IfStmtKind::IfElse;
}
nextToken();
HandleAttributes();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
ElseLeftBrace = FormatTok;
CompoundStatementIndenter Indenter(this, Style, Line->Level);
if (parseBlock() == IfStmtKind::IfOnly)
Kind = IfStmtKind::IfElseIf;
addUnwrappedLine();
- } else if (FormatTok->Tok.is(tok::kw_if)) {
+ } else if (FormatTok->is(tok::kw_if)) {
FormatToken *Previous = Tokens->getPreviousToken();
const bool IsPrecededByComment = Previous && Previous->is(tok::comment);
if (IsPrecededByComment) {
@@ -2546,8 +2546,8 @@ void UnwrappedLineParser::parseTryCatch() {
tok::kw___finally) ||
((Style.Language == FormatStyle::LK_Java || Style.isJavaScript()) &&
FormatTok->is(Keywords.kw_finally)) ||
- (FormatTok->Tok.isObjCAtKeyword(tok::objc_catch) ||
- FormatTok->Tok.isObjCAtKeyword(tok::objc_finally))))
+ (FormatTok->isObjCAtKeyword(tok::objc_catch) ||
+ FormatTok->isObjCAtKeyword(tok::objc_finally))))
break;
nextToken();
while (FormatTok->isNot(tok::l_brace)) {
@@ -2595,7 +2595,7 @@ void UnwrappedLineParser::parseNamespace() {
else
nextToken();
}
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
if (ShouldBreakBeforeBrace(Style, InitialToken))
addUnwrappedLine();
@@ -2620,7 +2620,7 @@ void UnwrappedLineParser::parseNamespace() {
// Munch the semicolon after a namespace. This is more common than one would
// think. Putting the semicolon into its own line is very ugly.
- if (FormatTok->Tok.is(tok::semi))
+ if (FormatTok->is(tok::semi))
nextToken();
addUnwrappedLine(AddLevels > 0 ? LineLevel::Remove : LineLevel::Keep);
@@ -2678,12 +2678,12 @@ void UnwrappedLineParser::parseForOrWhileLoop() {
nextToken();
if (Style.isCpp() && FormatTok->is(tok::kw_co_await))
nextToken();
- if (FormatTok->Tok.is(tok::l_paren))
+ if (FormatTok->is(tok::l_paren))
parseParens();
keepAncestorBraces();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
FormatToken *LeftBrace = FormatTok;
CompoundStatementIndenter Indenter(this, Style, Line->Level);
parseBlock();
@@ -2702,12 +2702,12 @@ void UnwrappedLineParser::parseForOrWhileLoop() {
}
void UnwrappedLineParser::parseDoWhile() {
- assert(FormatTok->Tok.is(tok::kw_do) && "'do' expected");
+ assert(FormatTok->is(tok::kw_do) && "'do' expected");
nextToken();
keepAncestorBraces();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
parseBlock();
if (Style.BraceWrapping.BeforeWhile)
@@ -2720,7 +2720,7 @@ void UnwrappedLineParser::parseDoWhile() {
NestedTooDeep.pop_back();
// FIXME: Add error handling.
- if (!FormatTok->Tok.is(tok::kw_while)) {
+ if (!FormatTok->is(tok::kw_while)) {
addUnwrappedLine();
return;
}
@@ -2743,13 +2743,13 @@ void UnwrappedLineParser::parseLabel(bool LeftAlignLabel) {
Line->Level = 0;
if (!Style.IndentCaseBlocks && CommentsBeforeNextToken.empty() &&
- FormatTok->Tok.is(tok::l_brace)) {
+ FormatTok->is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Line->Level,
Style.BraceWrapping.AfterCaseLabel,
Style.BraceWrapping.IndentBraces);
parseBlock();
- if (FormatTok->Tok.is(tok::kw_break)) {
+ if (FormatTok->is(tok::kw_break)) {
if (Style.BraceWrapping.AfterControlStatement ==
FormatStyle::BWACS_Always) {
addUnwrappedLine();
@@ -2773,24 +2773,24 @@ void UnwrappedLineParser::parseLabel(bool LeftAlignLabel) {
}
void UnwrappedLineParser::parseCaseLabel() {
- assert(FormatTok->Tok.is(tok::kw_case) && "'case' expected");
+ assert(FormatTok->is(tok::kw_case) && "'case' expected");
// FIXME: fix handling of complex expressions here.
do {
nextToken();
- } while (!eof() && !FormatTok->Tok.is(tok::colon));
+ } while (!eof() && !FormatTok->is(tok::colon));
parseLabel();
}
void UnwrappedLineParser::parseSwitch() {
- assert(FormatTok->Tok.is(tok::kw_switch) && "'switch' expected");
+ assert(FormatTok->is(tok::kw_switch) && "'switch' expected");
nextToken();
- if (FormatTok->Tok.is(tok::l_paren))
+ if (FormatTok->is(tok::l_paren))
parseParens();
keepAncestorBraces();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
CompoundStatementIndenter Indenter(this, Style, Line->Level);
parseBlock();
addUnwrappedLine();
@@ -2812,10 +2812,10 @@ void UnwrappedLineParser::parseAccessSpecifier() {
if (FormatTok->isOneOf(Keywords.kw_slots, Keywords.kw_qslots))
nextToken();
// Otherwise, we don't know what it is, and we'd better keep the next token.
- if (FormatTok->Tok.is(tok::colon)) {
+ if (FormatTok->is(tok::colon)) {
nextToken();
addUnwrappedLine();
- } else if (!FormatTok->Tok.is(tok::coloncolon) &&
+ } else if (!FormatTok->is(tok::coloncolon) &&
!std::binary_search(COperatorsFollowingVar.begin(),
COperatorsFollowingVar.end(),
FormatTok->Tok.getKind())) {
@@ -2833,16 +2833,16 @@ void UnwrappedLineParser::parseAccessSpecifier() {
/// Returns if either the concept has been completely parsed, or if it detects
/// that the concept definition is incorrect.
void UnwrappedLineParser::parseConcept() {
- assert(FormatTok->Tok.is(tok::kw_concept) && "'concept' expected");
+ assert(FormatTok->is(tok::kw_concept) && "'concept' expected");
nextToken();
- if (!FormatTok->Tok.is(tok::identifier))
+ if (!FormatTok->is(tok::identifier))
return;
nextToken();
- if (!FormatTok->Tok.is(tok::equal))
+ if (!FormatTok->is(tok::equal))
return;
nextToken();
parseConstraintExpression();
- if (FormatTok->Tok.is(tok::semi))
+ if (FormatTok->is(tok::semi))
nextToken();
addUnwrappedLine();
}
@@ -2851,7 +2851,7 @@ void UnwrappedLineParser::parseConcept() {
/// \pre The current token has to be the requires keyword.
/// \returns true if it parsed a clause.
bool clang::format::UnwrappedLineParser::parseRequires() {
- assert(FormatTok->Tok.is(tok::kw_requires) && "'requires' expected");
+ assert(FormatTok->is(tok::kw_requires) && "'requires' expected");
auto RequiresToken = FormatTok;
// We try to guess if it is a requires clause, or a requires expression. For
@@ -2990,7 +2990,7 @@ bool clang::format::UnwrappedLineParser::parseRequires() {
/// the clause is incorrect.
void UnwrappedLineParser::parseRequiresClause(FormatToken *RequiresToken) {
assert(FormatTok->getPreviousNonComment() == RequiresToken);
- assert(RequiresToken->Tok.is(tok::kw_requires) && "'requires' expected");
+ assert(RequiresToken->is(tok::kw_requires) && "'requires' expected");
assert(RequiresToken->getType() == TT_Unknown);
// If there is no previous token, we are within a requires expression,
@@ -3019,7 +3019,7 @@ void UnwrappedLineParser::parseRequiresClause(FormatToken *RequiresToken) {
/// that the expression is incorrect.
void UnwrappedLineParser::parseRequiresExpression(FormatToken *RequiresToken) {
assert(FormatTok->getPreviousNonComment() == RequiresToken);
- assert(RequiresToken->Tok.is(tok::kw_requires) && "'requires' expected");
+ assert(RequiresToken->is(tok::kw_requires) && "'requires' expected");
assert(RequiresToken->getType() == TT_Unknown);
RequiresToken->setType(TT_RequiresExpression);
@@ -3088,7 +3088,7 @@ void UnwrappedLineParser::parseConstraintExpression() {
// Read identifier with optional template declaration.
nextToken();
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
parseBracedList(/*ContinueOnSemicolons=*/false, /*IsEnum=*/false,
/*ClosingBraceKind=*/tok::greater);
break;
@@ -3178,7 +3178,7 @@ bool UnwrappedLineParser::parseEnum() {
const FormatToken &InitialToken = *FormatTok;
// Won't be 'enum' for NS_ENUMs.
- if (FormatTok->Tok.is(tok::kw_enum))
+ if (FormatTok->is(tok::kw_enum))
nextToken();
// In TypeScript, "enum" can also be used as property name, e.g. in interface
@@ -3192,7 +3192,7 @@ bool UnwrappedLineParser::parseEnum() {
return false;
// Eat up enum class ...
- if (FormatTok->Tok.is(tok::kw_class) || FormatTok->Tok.is(tok::kw_struct))
+ if (FormatTok->isOneOf(tok::kw_class, tok::kw_struct))
nextToken();
while (FormatTok->Tok.getIdentifierInfo() ||
@@ -3402,7 +3402,7 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
nextToken();
// We can have macros or attributes in between 'class' and the class name.
if (!IsNonMacroIdentifier) {
- if (FormatTok->Tok.is(tok::l_paren)) {
+ if (FormatTok->is(tok::l_paren)) {
parseParens();
} else if (FormatTok->is(TT_AttributeSquare)) {
parseSquare();
@@ -3440,7 +3440,7 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
break;
}
}
- if (FormatTok->Tok.is(tok::semi))
+ if (FormatTok->is(tok::semi))
return;
if (Style.isCSharp() && FormatTok->is(Keywords.kw_where)) {
addUnwrappedLine();
@@ -3465,7 +3465,7 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
return TT_RecordLBrace;
}
};
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
FormatTok->setType(GetBraceType(InitialToken));
if (ParseAsExpr) {
parseChildBlock();
@@ -3483,14 +3483,14 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
}
void UnwrappedLineParser::parseObjCMethod() {
- assert(FormatTok->Tok.isOneOf(tok::l_paren, tok::identifier) &&
+ assert(FormatTok->isOneOf(tok::l_paren, tok::identifier) &&
"'(' or identifier expected.");
do {
- if (FormatTok->Tok.is(tok::semi)) {
+ if (FormatTok->is(tok::semi)) {
nextToken();
addUnwrappedLine();
return;
- } else if (FormatTok->Tok.is(tok::l_brace)) {
+ } else if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.AfterFunction)
addUnwrappedLine();
parseBlock();
@@ -3503,20 +3503,20 @@ void UnwrappedLineParser::parseObjCMethod() {
}
void UnwrappedLineParser::parseObjCProtocolList() {
- assert(FormatTok->Tok.is(tok::less) && "'<' expected.");
+ assert(FormatTok->is(tok::less) && "'<' expected.");
do {
nextToken();
// Early exit in case someone forgot a close angle.
if (FormatTok->isOneOf(tok::semi, tok::l_brace) ||
- FormatTok->Tok.isObjCAtKeyword(tok::objc_end))
+ FormatTok->isObjCAtKeyword(tok::objc_end))
return;
- } while (!eof() && FormatTok->Tok.isNot(tok::greater));
+ } while (!eof() && FormatTok->isNot(tok::greater));
nextToken(); // Skip '>'.
}
void UnwrappedLineParser::parseObjCUntilAtEnd() {
do {
- if (FormatTok->Tok.isObjCAtKeyword(tok::objc_end)) {
+ if (FormatTok->isObjCAtKeyword(tok::objc_end)) {
nextToken();
addUnwrappedLine();
break;
@@ -3546,22 +3546,22 @@ void UnwrappedLineParser::parseObjCInterfaceOrImplementation() {
// @interface can be followed by a lightweight generic
// specialization list, then either a base class or a category.
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
parseObjCLightweightGenerics();
- if (FormatTok->Tok.is(tok::colon)) {
+ if (FormatTok->is(tok::colon)) {
nextToken();
nextToken(); // base class name
// The base class can also have lightweight generics applied to it.
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
parseObjCLightweightGenerics();
- } else if (FormatTok->Tok.is(tok::l_paren))
+ } else if (FormatTok->is(tok::l_paren))
// Skip category, if present.
parseParens();
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
parseObjCProtocolList();
- if (FormatTok->Tok.is(tok::l_brace)) {
+ if (FormatTok->is(tok::l_brace)) {
if (Style.BraceWrapping.AfterObjCDeclaration)
addUnwrappedLine();
parseBlock(/*MustBeDeclaration=*/true);
@@ -3575,7 +3575,7 @@ void UnwrappedLineParser::parseObjCInterfaceOrImplementation() {
}
void UnwrappedLineParser::parseObjCLightweightGenerics() {
- assert(FormatTok->Tok.is(tok::less));
+ assert(FormatTok->is(tok::less));
// Unlike protocol lists, generic parameterizations support
// nested angles:
//
@@ -3588,11 +3588,11 @@ void UnwrappedLineParser::parseObjCLightweightGenerics() {
nextToken();
// Early exit in case someone forgot a close angle.
if (FormatTok->isOneOf(tok::semi, tok::l_brace) ||
- FormatTok->Tok.isObjCAtKeyword(tok::objc_end))
+ FormatTok->isObjCAtKeyword(tok::objc_end))
break;
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
++NumOpenAngles;
- else if (FormatTok->Tok.is(tok::greater)) {
+ else if (FormatTok->is(tok::greater)) {
assert(NumOpenAngles > 0 && "'>' makes NumOpenAngles negative");
--NumOpenAngles;
}
@@ -3617,11 +3617,11 @@ bool UnwrappedLineParser::parseObjCProtocol() {
nextToken(); // protocol name
- if (FormatTok->Tok.is(tok::less))
+ if (FormatTok->is(tok::less))
parseObjCProtocolList();
// Check for protocol declaration.
- if (FormatTok->Tok.is(tok::semi)) {
+ if (FormatTok->is(tok::semi)) {
nextToken();
addUnwrappedLine();
return true;
@@ -3736,7 +3736,7 @@ void UnwrappedLineParser::addUnwrappedLine(LineLevel AdjustLevel) {
FormatTok->Previous = nullptr;
}
-bool UnwrappedLineParser::eof() const { return FormatTok->Tok.is(tok::eof); }
+bool UnwrappedLineParser::eof() const { return FormatTok->is(tok::eof); }
bool UnwrappedLineParser::isOnNewLine(const FormatToken &FormatTok) {
return (Line->InPPDirective || FormatTok.HasUnescapedNewline) &&
@@ -3973,9 +3973,9 @@ void UnwrappedLineParser::readToken(int LevelDifference) {
FirstNonCommentOnLine = IsFirstNonCommentOnLine(
FirstNonCommentOnLine, *FormatTok, PreviousWasComment);
- PreviousWasComment = FormatTok->Tok.is(tok::comment);
+ PreviousWasComment = FormatTok->is(tok::comment);
- while (!Line->InPPDirective && FormatTok->Tok.is(tok::hash) &&
+ while (!Line->InPPDirective && FormatTok->is(tok::hash) &&
FirstNonCommentOnLine) {
distributeComments(Comments, FormatTok);
Comments.clear();
@@ -3995,7 +3995,7 @@ void UnwrappedLineParser::readToken(int LevelDifference) {
Line->Level += PPBranchLevel;
flushComments(isOnNewLine(*FormatTok));
parsePPDirective();
- PreviousWasComment = FormatTok->Tok.is(tok::comment);
+ PreviousWasComment = FormatTok->is(tok::comment);
FirstNonCommentOnLine = IsFirstNonCommentOnLine(
FirstNonCommentOnLine, *FormatTok, PreviousWasComment);
}
@@ -4004,7 +4004,7 @@ void UnwrappedLineParser::readToken(int LevelDifference) {
!Line->InPPDirective)
continue;
- if (!FormatTok->Tok.is(tok::comment)) {
+ if (!FormatTok->is(tok::comment)) {
distributeComments(Comments, FormatTok);
Comments.clear();
return;
More information about the cfe-commits
mailing list