https://github.com/tru updated https://github.com/llvm/llvm-project/pull/102419
>From b084eff6ca9f331e107b68f13dfa7217c782688a Mon Sep 17 00:00:00 2001
From: Owen Pan <owenpi...@gmail.com>
Date: Wed, 7 Aug 2024 21:05:42 -0700
Subject: [PATCH] [clang-format] Fix a bug in annotating CastRParen (#102261)
Fixes #102102.
(cherry picked from commit 8c7a038f9029c675f2a52ff5e85f7b6005ec7b3e)
---
clang/lib/Format/TokenAnnotator.cpp | 11 ++++++++++-
clang/unittests/Format/TokenAnnotatorTest.cpp | 7 +++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/clang/lib/Format/TokenAnnotator.cpp
b/clang/lib/Format/TokenAnnotator.cpp
index 63c8699fd62d16..6b9253613788c0 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -2872,9 +2872,18 @@ class AnnotatingParser {
return false;
// Search for unexpected tokens.
- for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous)
+ for (auto *Prev = BeforeRParen; Prev != LParen; Prev = Prev->Previous) {
+ if (Prev->is(tok::r_paren)) {
+ Prev = Prev->MatchingParen;
+ if (!Prev)
+ return false;
+ if (Prev->is(TT_FunctionTypeLParen))
+ break;
+ continue;
+ }
if (!Prev->isOneOf(tok::kw_const, tok::identifier, tok::coloncolon))
return false;
+ }
return true;
}
diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp
b/clang/unittests/Format/TokenAnnotatorTest.cpp
index 386649bb6679ff..0b5475ea95989c 100644
--- a/clang/unittests/Format/TokenAnnotatorTest.cpp
+++ b/clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -734,6 +734,13 @@ TEST_F(TokenAnnotatorTest, UnderstandsCasts) {
EXPECT_TOKEN(Tokens[10], tok::r_paren, TT_Unknown);
EXPECT_TOKEN(Tokens[11], tok::amp, TT_BinaryOperator);
+ Tokens = annotate("func((void (*)())&a);");
+ ASSERT_EQ(Tokens.size(), 15u) << Tokens;
+ EXPECT_TOKEN(Tokens[4], tok::l_paren, TT_FunctionTypeLParen);
+ EXPECT_TOKEN(Tokens[5], tok::star, TT_PointerOrReference);
+ EXPECT_TOKEN(Tokens[9], tok::r_paren, TT_CastRParen);
+ EXPECT_TOKEN(Tokens[10], tok::amp, TT_UnaryOperator);
+
auto Style = getLLVMStyle();
Style.TypeNames.push_back("Foo");
Tokens = annotate("#define FOO(bar) foo((Foo)&bar)", Style);
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
