[PATCH] D120445: [clang-format] Treat && followed by noexcept operator as a binary operator inside template arguments
Marek Kurdej via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Mon Feb 28 02:55:12 PST 2022
This revision was landed with ongoing or failed builds.
This revision was automatically updated to reflect the committed changes.
Closed by commit rG24d4f601aa6d: [clang-format] Treat && followed by noexcept operator as a binary operator… (authored by penagos, committed by curdeius).
Changed prior to commit:
https://reviews.llvm.org/D120445?vs=411272&id=411769#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D120445/new/
https://reviews.llvm.org/D120445
Files:
clang/lib/Format/TokenAnnotator.cpp
clang/unittests/Format/FormatTest.cpp
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -9512,6 +9512,8 @@
verifyFormat("f(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"
" .template operator()<A>());",
getLLVMStyleWithColumns(35));
+ verifyFormat("bool_constant<a && noexcept(f())>");
+ verifyFormat("bool_constant<a || noexcept(f())>");
// Not template parameters.
verifyFormat("return a < b && c > d;");
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -2089,6 +2089,10 @@
return TT_UnaryOperator;
const FormatToken *NextToken = Tok.getNextNonComment();
+
+ if (InTemplateArgument && NextToken && NextToken->is(tok::kw_noexcept))
+ return TT_BinaryOperator;
+
if (!NextToken ||
NextToken->isOneOf(tok::arrow, tok::equal, tok::kw_noexcept) ||
NextToken->canBePointerOrReferenceQualifier() ||
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D120445.411769.patch
Type: text/x-patch
Size: 1132 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220228/1aea4751/attachment.bin>
More information about the cfe-commits
mailing list