[clang] 151d0a4 - [clang-format] Handle __attribute/__declspec/AttributeMacro consistently (#67518)
via cfe-commits
cfe-commits at lists.llvm.org
Fri Sep 29 12:03:13 PDT 2023
Author: Owen Pan
Date: 2023-09-29T12:03:08-07:00
New Revision: 151d0a4db321dd0d081c7f69f84158580bd9979a
URL: https://github.com/llvm/llvm-project/commit/151d0a4db321dd0d081c7f69f84158580bd9979a
DIFF: https://github.com/llvm/llvm-project/commit/151d0a4db321dd0d081c7f69f84158580bd9979a.diff
LOG: [clang-format] Handle __attribute/__declspec/AttributeMacro consistently (#67518)
Added:
Modified:
clang/lib/Format/FormatToken.h
clang/lib/Format/NamespaceEndCommentsFixer.cpp
clang/lib/Format/TokenAnnotator.cpp
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/TokenAnnotatorTest.cpp
Removed:
################################################################################
diff --git a/clang/lib/Format/FormatToken.h b/clang/lib/Format/FormatToken.h
index 986849abd8f9206..dbd3a6e70f037ef 100644
--- a/clang/lib/Format/FormatToken.h
+++ b/clang/lib/Format/FormatToken.h
@@ -618,6 +618,10 @@ struct FormatToken {
bool isStringLiteral() const { return tok::isStringLiteral(Tok.getKind()); }
+ bool isAttribute() const {
+ return isOneOf(tok::kw___attribute, tok::kw___declspec, TT_AttributeMacro);
+ }
+
bool isObjCAtKeyword(tok::ObjCKeywordKind Kind) const {
return Tok.isObjCAtKeyword(Kind);
}
@@ -633,9 +637,10 @@ struct FormatToken {
bool canBePointerOrReferenceQualifier() const {
return isOneOf(tok::kw_const, tok::kw_restrict, tok::kw_volatile,
- tok::kw___attribute, tok::kw__Nonnull, tok::kw__Nullable,
+ tok::kw__Nonnull, tok::kw__Nullable,
tok::kw__Null_unspecified, tok::kw___ptr32, tok::kw___ptr64,
- tok::kw___funcref, TT_AttributeMacro);
+ tok::kw___funcref) ||
+ isAttribute();
}
/// Determine whether the token is a simple-type-specifier.
@@ -708,25 +713,16 @@ struct FormatToken {
/// Returns \c true if this is a keyword that can be used
/// like a function call (e.g. sizeof, typeid, ...).
bool isFunctionLikeKeyword() const {
- switch (Tok.getKind()) {
- case tok::kw_throw:
- case tok::kw_typeid:
- case tok::kw_return:
- case tok::kw_sizeof:
- case tok::kw_alignof:
- case tok::kw_alignas:
- case tok::kw_decltype:
- case tok::kw_noexcept:
- case tok::kw_static_assert:
- case tok::kw__Atomic:
- case tok::kw___attribute:
-#define TRANSFORM_TYPE_TRAIT_DEF(_, Trait) case tok::kw___##Trait:
-#include "clang/Basic/TransformTypeTraits.def"
- case tok::kw_requires:
+ if (isAttribute())
return true;
- default:
- return false;
- }
+
+ return isOneOf(tok::kw_throw, tok::kw_typeid, tok::kw_return,
+ tok::kw_sizeof, tok::kw_alignof, tok::kw_alignas,
+ tok::kw_decltype, tok::kw_noexcept, tok::kw_static_assert,
+ tok::kw__Atomic,
+#define TRANSFORM_TYPE_TRAIT_DEF(_, Trait) tok::kw___##Trait,
+#include "clang/Basic/TransformTypeTraits.def"
+ tok::kw_requires);
}
/// Returns \c true if this is a string literal that's like a label,
diff --git a/clang/lib/Format/NamespaceEndCommentsFixer.cpp b/clang/lib/Format/NamespaceEndCommentsFixer.cpp
index aed31db87495406..08f8d6840fe00a8 100644
--- a/clang/lib/Format/NamespaceEndCommentsFixer.cpp
+++ b/clang/lib/Format/NamespaceEndCommentsFixer.cpp
@@ -48,7 +48,7 @@ processTokens(const FormatToken *Tok, tok::TokenKind StartTok,
const FormatToken *skipAttribute(const FormatToken *Tok) {
if (!Tok)
return nullptr;
- if (Tok->is(tok::kw___attribute)) {
+ if (Tok->isAttribute()) {
Tok = Tok->getNextNonComment();
Tok = processTokens(Tok, tok::l_paren, tok::r_paren, nullptr);
} else if (Tok->is(tok::l_square)) {
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index e86e9b89bcde766..ae2cbbdce934618 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -376,7 +376,7 @@ class AnnotatingParser {
// Infer the role of the l_paren based on the previous token if we haven't
// detected one yet.
if (PrevNonComment && OpeningParen.is(TT_Unknown)) {
- if (PrevNonComment->is(tok::kw___attribute)) {
+ if (PrevNonComment->isAttribute()) {
OpeningParen.setType(TT_AttributeLParen);
} else if (PrevNonComment->isOneOf(TT_TypenameMacro, tok::kw_decltype,
tok::kw_typeof,
@@ -1207,11 +1207,13 @@ class AnnotatingParser {
return false;
if (Line.MustBeDeclaration && Contexts.size() == 1 &&
!Contexts.back().IsExpression && !Line.startsWith(TT_ObjCProperty) &&
- !Tok->isOneOf(TT_TypeDeclarationParen, TT_RequiresExpressionLParen) &&
- (!Tok->Previous ||
- !Tok->Previous->isOneOf(tok::kw___attribute, TT_RequiresClause,
- TT_LeadingJavaAnnotation))) {
- Line.MightBeFunctionDecl = true;
+ !Tok->isOneOf(TT_TypeDeclarationParen, TT_RequiresExpressionLParen)) {
+ if (const auto *Previous = Tok->Previous;
+ !Previous ||
+ (!Previous->isAttribute() &&
+ !Previous->isOneOf(TT_RequiresClause, TT_LeadingJavaAnnotation))) {
+ Line.MightBeFunctionDecl = true;
+ }
}
break;
case tok::l_square:
@@ -2389,7 +2391,7 @@ class AnnotatingParser {
assert(T->MatchingParen->is(tok::l_paren));
assert(T->MatchingParen->is(TT_AttributeLParen));
if (const auto *Tok = T->MatchingParen->Previous;
- Tok && Tok->is(tok::kw___attribute)) {
+ Tok && Tok->isAttribute()) {
T = Tok->Previous;
continue;
}
@@ -5613,10 +5615,11 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line,
tok::less, tok::coloncolon);
}
- if (Right.is(tok::kw___attribute) ||
- (Right.is(tok::l_square) && Right.is(TT_AttributeSquare))) {
+ if (Right.isAttribute())
+ return true;
+
+ if (Right.is(tok::l_square) && Right.is(TT_AttributeSquare))
return Left.isNot(TT_AttributeSquare);
- }
if (Left.is(tok::identifier) && Right.is(tok::string_literal))
return true;
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 9fbdfb91e21dec9..336e23dc6ff6aee 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -354,7 +354,7 @@ bool UnwrappedLineParser::parseLevel(const FormatToken *OpeningBrace,
bool SwitchLabelEncountered = false;
do {
- if (FormatTok->getType() == TT_AttributeMacro) {
+ if (FormatTok->isAttribute()) {
nextToken();
continue;
}
@@ -2658,7 +2658,7 @@ static void markOptionalBraces(FormatToken *LeftBrace) {
void UnwrappedLineParser::handleAttributes() {
// Handle AttributeMacro, e.g. `if (x) UNLIKELY`.
- if (FormatTok->is(TT_AttributeMacro))
+ if (FormatTok->isAttribute())
nextToken();
else if (FormatTok->is(tok::l_square))
handleCppAttributes();
@@ -3835,8 +3835,8 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
// it is often token-pasted.
// An [[attribute]] can be before the identifier.
while (FormatTok->isOneOf(tok::identifier, tok::coloncolon, tok::hashhash,
- tok::kw___attribute, tok::kw___declspec,
tok::kw_alignas, tok::l_square) ||
+ FormatTok->isAttribute() ||
((Style.Language == FormatStyle::LK_Java || Style.isJavaScript()) &&
FormatTok->isOneOf(tok::period, tok::comma))) {
if (Style.isJavaScript() &&
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp
index d3437bffeba2d35..cf66076c86216aa 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -2107,6 +2107,19 @@ TEST_F(TokenAnnotatorTest, UnderstandsAttributes) {
EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_Unknown);
EXPECT_TOKEN(Tokens[6], tok::r_paren, TT_Unknown);
EXPECT_TOKEN(Tokens[7], tok::r_paren, TT_AttributeRParen);
+
+ Tokens = annotate("bool foo __declspec(dllimport);");
+ ASSERT_EQ(Tokens.size(), 8u) << Tokens;
+ EXPECT_TOKEN(Tokens[3], tok::l_paren, TT_AttributeLParen);
+ EXPECT_TOKEN(Tokens[5], tok::r_paren, TT_AttributeRParen);
+
+ FormatStyle Style = getLLVMStyle();
+ Style.AttributeMacros.push_back("FOO");
+ Tokens = annotate("bool foo FOO(unused);", Style);
+ ASSERT_EQ(Tokens.size(), 8u) << Tokens;
+ EXPECT_TOKEN(Tokens[2], tok::identifier, TT_AttributeMacro);
+ EXPECT_TOKEN(Tokens[3], tok::l_paren, TT_AttributeLParen);
+ EXPECT_TOKEN(Tokens[5], tok::r_paren, TT_AttributeRParen);
}
} // namespace
More information about the cfe-commits
mailing list