nrieck created this revision. nrieck requested review of this revision. Herald added a project: clang. Herald added a subscriber: cfe-commits.
This patch fixes left pointer alignment after pointer qualifiers of operators. Currently "operator void const*()" is formatted with a space between const and pointer despite setting PointerAlignment to Left. AFAICS this has been broken since clang-format 10. Repository: rG LLVM Github Monorepo 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(); @@ -18639,6 +18660,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); @@ -18660,6 +18685,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); @@ -18668,6 +18694,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); @@ -18688,6 +18715,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); @@ -18709,6 +18741,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); @@ -18719,6 +18752,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); @@ -18754,6 +18788,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); @@ -18761,6 +18796,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 @@ -2964,11 +2964,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