[PATCH] D121584: [clang-format] Correctly recognize arrays in template parameter list.
Marek Kurdej via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Mar 14 04:03:42 PDT 2022
curdeius created this revision.
curdeius added reviewers: MyDeveloperDay, HazardyKnusperkeks, owenpan.
Herald added a project: All.
curdeius requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Fixes https://github.com/llvm/llvm-project/issues/54245.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D121584
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/TokenAnnotatorTest.cpp
Index: clang/unittests/Format/TokenAnnotatorTest.cpp
===================================================================
--- clang/unittests/Format/TokenAnnotatorTest.cpp
+++ clang/unittests/Format/TokenAnnotatorTest.cpp
@@ -98,6 +98,20 @@
auto Tokens = annotate("struct S {};");
EXPECT_EQ(Tokens.size(), 6u) << Tokens;
EXPECT_TOKEN(Tokens[2], tok::l_brace, TT_StructLBrace);
+
+ Tokens = annotate("template <typename T> struct S<const T[N]> {};");
+ EXPECT_EQ(Tokens.size(), 18u) << Tokens;
+ EXPECT_TOKEN(Tokens[7], tok::less, TT_TemplateOpener);
+ EXPECT_TOKEN(Tokens[10], tok::l_square, TT_ArraySubscriptLSquare);
+ EXPECT_TOKEN(Tokens[13], tok::greater, TT_TemplateCloser);
+ EXPECT_TOKEN(Tokens[14], tok::l_brace, TT_StructLBrace);
+
+ Tokens = annotate("template <typename T> struct S<T const[N]> {};");
+ EXPECT_EQ(Tokens.size(), 18u) << Tokens;
+ EXPECT_TOKEN(Tokens[7], tok::less, TT_TemplateOpener);
+ EXPECT_TOKEN(Tokens[10], tok::l_square, TT_ArraySubscriptLSquare);
+ EXPECT_TOKEN(Tokens[13], tok::greater, TT_TemplateCloser);
+ EXPECT_TOKEN(Tokens[14], tok::l_brace, TT_StructLBrace);
}
TEST_F(TokenAnnotatorTest, UnderstandsUnions) {
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -1935,6 +1935,11 @@
if (!tryToParseLambdaIntroducer())
return false;
+ // `[something] >` is not a lambda, but an array type in a template parameter
+ // list.
+ if (FormatTok->is(tok::greater))
+ return false;
+
bool SeenArrow = false;
bool InTemplateParameterList = false;
@@ -3524,7 +3529,7 @@
// Don't try parsing a lambda if we had a closing parenthesis before,
// it was probably a pointer to an array: int (*)[].
if (!tryToParseLambda())
- break;
+ continue;
} else {
parseSquare();
continue;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D121584.415051.patch
Type: text/x-patch
Size: 1994 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220314/12365d5a/attachment.bin>
More information about the cfe-commits
mailing list