[PATCH] D123896: [clang-format] fix nested angle brackets parse inside concept definition
Sergey Semushin via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Sat Apr 16 00:30:17 PDT 2022
predelnik created this revision.
Herald added a project: All.
predelnik requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
Due to how parseBracedList always stopped on the first closing angle
bracket and was used in parsing angle bracketed expression inside concept
definition, nested brackets inside concepts were parsed incorrectly.
nextToken() call before calling parseBracedList is required because
we were processing opening angle bracket inside parseBracedList second
time leading to incorrect logic after my fix.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D123896
Files:
clang/lib/Format/UnwrappedLineParser.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -24040,6 +24040,12 @@
verifyFormat("template <class T, class T2>\n"
"concept Same = __is_same_as<T, T2>;");
+ verifyFormat(
+ "template <class _InIt, class _OutIt>\n"
+ "concept _Can_reread_dest =\n"
+ " std::forward_iterator<_OutIt> &&\n"
+ " std::same_as<std::iter_value_t<_InIt>, std::iter_value_t<_OutIt>>;");
+
auto Style = getLLVMStyle();
Style.BreakBeforeConceptDeclarations = FormatStyle::BBCDS_Allowed;
Index: clang/lib/Format/UnwrappedLineParser.cpp
===================================================================
--- clang/lib/Format/UnwrappedLineParser.cpp
+++ clang/lib/Format/UnwrappedLineParser.cpp
@@ -2174,7 +2174,8 @@
parseBracedList();
break;
case tok::less:
- if (Style.Language == FormatStyle::LK_Proto) {
+ if (Style.Language == FormatStyle::LK_Proto ||
+ ClosingBraceKind == tok::greater) {
nextToken();
parseBracedList(/*ContinueOnSemicolons=*/false, /*IsEnum=*/false,
/*ClosingBraceKind=*/tok::greater);
@@ -3218,6 +3219,7 @@
if (!FormatTok->is(tok::less))
return;
+ nextToken();
parseBracedList(/*ContinueOnSemicolons=*/false, /*IsEnum=*/false,
/*ClosingBraceKind=*/tok::greater);
break;
@@ -3258,9 +3260,11 @@
// Read identifier with optional template declaration.
nextToken();
- if (FormatTok->is(tok::less))
+ if (FormatTok->is(tok::less)) {
+ nextToken();
parseBracedList(/*ContinueOnSemicolons=*/false, /*IsEnum=*/false,
/*ClosingBraceKind=*/tok::greater);
+ }
break;
}
} while (!eof());
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D123896.423227.patch
Type: text/x-patch
Size: 1907 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220416/81de51bb/attachment.bin>
More information about the cfe-commits
mailing list