diff options
author | Emilia Dreamer <emilia@rymiel.space> | 2023-02-25 12:19:13 +0200 |
---|---|---|
committer | Tobias Hieta <tobias@hieta.se> | 2023-03-06 08:21:26 +0100 |
commit | 5cdefb41c35bd79b763efcf467c0a9d5e211970e (patch) | |
tree | f0f3e3e1c7b3f5d32dd48ae93b4dcb8e9b19bf92 | |
parent | 076ceb7acede727c49a647e7d6e3d720f1fb8df0 (diff) | |
download | llvm-5cdefb41c35bd79b763efcf467c0a9d5e211970e.tar.gz |
[clang-format] Don't move qualifiers past pointers-to-member
Previously, given a pointer-to-member type such as `Foo const Bar::*`,
clang-format would see the `const Bar::` part as a regular type name
with scope resolution operators, and with `QualifierAlignment: Right` it
would attempt to "fix" it, resulting in `Foo Bar::const *`, a syntax
error.
This patch no longer allows qualifiers to be moved across `::*`.
Fixes https://github.com/llvm/llvm-project/issues/60898
Reviewed By: owenpan, MyDeveloperDay, HazardyKnusperkeks
Differential Revision: https://reviews.llvm.org/D144537
(cherry picked from commit 393e197cd6eb8942c4eaec3fd6d05bc2e2289212)
-rw-r--r-- | clang/lib/Format/QualifierAlignmentFixer.cpp | 5 | ||||
-rwxr-xr-x | clang/unittests/Format/QualifierFixerTest.cpp | 20 |
2 files changed, 24 insertions, 1 deletions
diff --git a/clang/lib/Format/QualifierAlignmentFixer.cpp b/clang/lib/Format/QualifierAlignmentFixer.cpp index cef8b36ff758..609b412380f8 100644 --- a/clang/lib/Format/QualifierAlignmentFixer.cpp +++ b/clang/lib/Format/QualifierAlignmentFixer.cpp @@ -280,8 +280,11 @@ const FormatToken *LeftRightQualifierAlignmentFixer::analyzeRight( // The case `const Foo &&` -> `Foo const &&` // The case `const std::Foo &&` -> `std::Foo const &&` // The case `const std::Foo<T> &&` -> `std::Foo<T> const &&` - while (Next && Next->isOneOf(tok::identifier, tok::coloncolon)) + // However, `const Bar::*` remains the same. + while (Next && Next->isOneOf(tok::identifier, tok::coloncolon) && + !Next->startsSequence(tok::coloncolon, tok::star)) { Next = Next->Next; + } if (Next && Next->is(TT_TemplateOpener)) { Next = Next->MatchingParen; // Move to the end of any template class members e.g. diff --git a/clang/unittests/Format/QualifierFixerTest.cpp b/clang/unittests/Format/QualifierFixerTest.cpp index 875ad8353e01..d320eacc52c8 100755 --- a/clang/unittests/Format/QualifierFixerTest.cpp +++ b/clang/unittests/Format/QualifierFixerTest.cpp @@ -420,6 +420,16 @@ TEST_F(QualifierFixerTest, RightQualifier) { // don't adjust macros verifyFormat("const INTPTR a;", "const INTPTR a;", Style); + + // Pointers to members + verifyFormat("int S::*a;", Style); + verifyFormat("int const S::*a;", "const int S:: *a;", Style); + verifyFormat("int const S::*const a;", "const int S::* const a;", Style); + verifyFormat("int A::*const A::*p1;", Style); + verifyFormat("float (C::*p)(int);", Style); + verifyFormat("float (C::*const p)(int);", Style); + verifyFormat("float (C::*p)(int) const;", Style); + verifyFormat("float const (C::*p)(int);", "const float (C::*p)(int);", Style); } TEST_F(QualifierFixerTest, LeftQualifier) { @@ -565,6 +575,16 @@ TEST_F(QualifierFixerTest, LeftQualifier) { // don't adjust macros verifyFormat("INTPTR const a;", "INTPTR const a;", Style); + + // Pointers to members + verifyFormat("int S::*a;", Style); + verifyFormat("const int S::*a;", "int const S:: *a;", Style); + verifyFormat("const int S::*const a;", "int const S::* const a;", Style); + verifyFormat("int A::*const A::*p1;", Style); + verifyFormat("float (C::*p)(int);", Style); + verifyFormat("float (C::*const p)(int);", Style); + verifyFormat("float (C::*p)(int) const;", Style); + verifyFormat("const float (C::*p)(int);", "float const (C::*p)(int);", Style); } TEST_F(QualifierFixerTest, ConstVolatileQualifiersOrder) { |