This revision was automatically updated to reflect the committed changes.
Closed by commit rGbc4b0fc53e47: [clang-format] Fix east const pointer
alignment of operators (authored by nrieck, committed by curdeius).
Changed prior to commit:
https://reviews.llvm.org/D99458?vs=333678&id=334173#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D99458/new/
https://reviews.llvm.org/D99458
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
@@ -12731,6 +12731,27 @@
verifyQualifierSpaces("void * const *x = NULL;", PAS_Right, SAPQ_Both);
verifyQualifierSpaces("void * const * x = NULL;", PAS_Middle, SAPQ_Both);
+ verifyQualifierSpaces("Foo::operator void const*();", PAS_Left, SAPQ_Default);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Right,
+ SAPQ_Default);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
+ SAPQ_Default);
+
+ verifyQualifierSpaces("Foo::operator void const*();", PAS_Left, SAPQ_Before);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Right,
+ SAPQ_Before);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
+ SAPQ_Before);
+
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Left, SAPQ_After);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Right, SAPQ_After);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle,
+ SAPQ_After);
+
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Left, SAPQ_Both);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Right, SAPQ_Both);
+ verifyQualifierSpaces("Foo::operator void const *();", PAS_Middle, SAPQ_Both);
+
#undef verifyQualifierSpaces
FormatStyle Spaces = getLLVMStyle();
@@ -18735,6 +18756,10 @@
verifyFormat("Foo::operator void **();", Style);
verifyFormat("Foo::operator void *&();", Style);
verifyFormat("Foo::operator void *&&();", Style);
+ verifyFormat("Foo::operator void const *();", Style);
+ verifyFormat("Foo::operator void const **();", Style);
+ verifyFormat("Foo::operator void const *&();", Style);
+ verifyFormat("Foo::operator void const *&&();", Style);
verifyFormat("Foo::operator()(void *);", Style);
verifyFormat("Foo::operator*(void *);", Style);
verifyFormat("Foo::operator*();", Style);
@@ -18756,6 +18781,7 @@
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void &();", Style);
+ verifyFormat("Foo::operator void const &();", Style);
verifyFormat("Foo::operator()(void &);", Style);
verifyFormat("Foo::operator&(void &);", Style);
verifyFormat("Foo::operator&();", Style);
@@ -18764,6 +18790,7 @@
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator**();", Style);
verifyFormat("Foo::operator void &&();", Style);
+ verifyFormat("Foo::operator void const &&();", Style);
verifyFormat("Foo::operator()(void &&);", Style);
verifyFormat("Foo::operator&&(void &&);", Style);
verifyFormat("Foo::operator&&();", Style);
@@ -18784,6 +18811,11 @@
verifyFormat("Foo::operator void*();", Style);
verifyFormat("Foo::operator void**();", Style);
verifyFormat("Foo::operator void*&();", Style);
+ verifyFormat("Foo::operator void*&&();", Style);
+ verifyFormat("Foo::operator void const*();", Style);
+ verifyFormat("Foo::operator void const**();", Style);
+ verifyFormat("Foo::operator void const*&();", Style);
+ verifyFormat("Foo::operator void const*&&();", Style);
verifyFormat("Foo::operator/*comment*/ void*();", Style);
verifyFormat("Foo::operator/*a*/ const /*b*/ void*();", Style);
verifyFormat("Foo::operator/*a*/ volatile /*b*/ void*();", Style);
@@ -18805,6 +18837,7 @@
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void&();", Style);
+ verifyFormat("Foo::operator void const&();", Style);
verifyFormat("Foo::operator/*comment*/ void&();", Style);
verifyFormat("Foo::operator/*a*/ const /*b*/ void&();", Style);
verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&();", Style);
@@ -18815,6 +18848,7 @@
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void&&();", Style);
+ verifyFormat("Foo::operator void const&&();", Style);
verifyFormat("Foo::operator/*comment*/ void&&();", Style);
verifyFormat("Foo::operator/*a*/ const /*b*/ void&&();", Style);
verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&&();", Style);
@@ -18850,6 +18884,7 @@
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void &();", Style);
+ verifyFormat("Foo::operator void const &();", Style);
verifyFormat("Foo::operator()(void &);", Style);
verifyFormat("Foo::operator&(void &);", Style);
verifyFormat("Foo::operator&();", Style);
@@ -18857,6 +18892,7 @@
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void &&();", Style);
+ verifyFormat("Foo::operator void const &&();", Style);
verifyFormat("Foo::operator()(void &&);", Style);
verifyFormat("Foo::operator&&(void &&);", Style);
verifyFormat("Foo::operator&&();", Style);
Index: clang/lib/Format/TokenAnnotator.cpp
===================================================================
--- clang/lib/Format/TokenAnnotator.cpp
+++ clang/lib/Format/TokenAnnotator.cpp
@@ -2957,6 +2957,8 @@
// Space between the type and the * in:
// operator void*()
// operator char*()
+ // operator void const*()
+ // operator void volatile*()
// operator /*comment*/ const char*()
// operator volatile /*comment*/ char*()
// operator Foo*()
@@ -2964,11 +2966,15 @@
// operator std::Foo*()
// operator C<T>::D<U>*()
// dependent on PointerAlignment style.
- if (Previous &&
- (Previous->endsSequence(tok::kw_operator) ||
- Previous->endsSequence(tok::kw_const, tok::kw_operator) ||
- Previous->endsSequence(tok::kw_volatile, tok::kw_operator)))
- return (Style.PointerAlignment != FormatStyle::PAS_Left);
+ if (Previous) {
+ if (Previous->endsSequence(tok::kw_operator))
+ return (Style.PointerAlignment != FormatStyle::PAS_Left);
+ if (Previous->is(tok::kw_const) || Previous->is(tok::kw_volatile))
+ return (Style.PointerAlignment != FormatStyle::PAS_Left) ||
+ (Style.SpaceAroundPointerQualifiers ==
+ FormatStyle::SAPQ_After) ||
+ (Style.SpaceAroundPointerQualifiers == FormatStyle::SAPQ_Both);
+ }
}
const auto SpaceRequiredForArrayInitializerLSquare =
[](const FormatToken &LSquareTok, const FormatStyle &Style) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
