https://github.com/HazardyKnusperkeks created
https://github.com/llvm/llvm-project/pull/65526:
When we are in an expression, it has to be a binary operator and not pointer of
reference.
From 7373d5822994616d9fba5d939815c9258d6f9a93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Sch=C3=A4pers?= <bjo...@hazardy.de>
Date: Wed, 6 Sep 2023 22:09:16 +0200
Subject: [PATCH] [clang-format] Fix misannotation of && before noexcept
When we are in an expression, it has to be a binary operator and not
pointer of reference.
---
clang/lib/Format/TokenAnnotator.cpp | 5 +++--
clang/unittests/Format/TokenAnnotatorTest.cpp | 7 +++++++
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index ea811414b73c506..3e0599eb540a95f 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2535,8 +2535,9 @@ class AnnotatingParser {
return TT_BinaryOperator;
if (!NextToken ||
- NextToken->isOneOf(tok::arrow, tok::equal, tok::kw_noexcept,
tok::comma,
- tok::r_paren, TT_RequiresClause) ||
+ NextToken->isOneOf(tok::arrow, tok::equal, tok::comma, tok::r_paren,
+ TT_RequiresClause) ||
+ (NextToken->is(tok::kw_noexcept) && !IsExpression) ||
NextToken->canBePointerOrReferenceQualifier() ||
(NextToken->is(tok::l_brace) && !NextToken->getNextNonComment())) {
return TT_PointerOrReference;
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp
b/clang/unittests/Format/TokenAnnotatorTest.cpp
index 467ade965d7c86a..66bfd7f0ef0d282 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -273,6 +273,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsUsesOfStarAndAmp) {
ASSERT_EQ(Tokens.size(), 19u) << Tokens;
EXPECT_TOKEN(Tokens[5], tok::ampamp, TT_BinaryOperator);
+ Tokens =
+ annotate("auto foo() noexcept(noexcept(bar()) && "
+ "trait<std::decay_t<decltype(bar())>> && noexcept(baz())) {}");
+ EXPECT_EQ(Tokens.size(), 38u) << Tokens;
+ EXPECT_TOKEN(Tokens[12], tok::ampamp, TT_BinaryOperator);
+ EXPECT_TOKEN(Tokens[27], tok::ampamp, TT_BinaryOperator);
+
FormatStyle Style = getLLVMStyle();
Style.TypeNames.push_back("MYI");
Tokens = annotate("if (MYI *p{nullptr})", Style);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
