This revision was automatically updated to reflect the committed changes.
Closed by commit rG33463cfba2be: clang-format: fix spacing in `operator const
char*()` (authored by krasimir).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72911/new/
https://reviews.llvm.org/D72911
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
@@ -15007,6 +15007,9 @@
Style.PointerAlignment = FormatStyle::PAS_Left;
verifyFormat("Foo::operator*();", Style);
verifyFormat("Foo::operator void*();", Style);
+ verifyFormat("Foo::operator/*comment*/ void*();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void*();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void*();", Style);
verifyFormat("Foo::operator()(void*);", Style);
verifyFormat("Foo::operator*(void*);", Style);
verifyFormat("Foo::operator*();", Style);
@@ -15014,6 +15017,9 @@
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void&();", Style);
+ verifyFormat("Foo::operator/*comment*/ void&();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void&();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&();", Style);
verifyFormat("Foo::operator()(void&);", Style);
verifyFormat("Foo::operator&(void&);", Style);
verifyFormat("Foo::operator&();", Style);
@@ -15021,6 +15027,9 @@
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void&&();", Style);
+ verifyFormat("Foo::operator/*comment*/ void&&();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void&&();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&&();", 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
@@ -2707,10 +2707,17 @@
return false;
if (Right.isOneOf(tok::star, tok::amp, tok::ampamp) &&
(Left.is(tok::identifier) || Left.isSimpleTypeSpecifier()) &&
- Left.Previous && Left.Previous->is(tok::kw_operator))
- // Space between the type and the *
- // operator void*(), operator char*(), operator Foo*() dependant
- // on PointerAlignment style.
+ // Space between the type and the * in:
+ // operator void*()
+ // operator char*()
+ // operator /*comment*/ const char*()
+ // operator volatile /*comment*/ char*()
+ // operator Foo*()
+ // dependent on PointerAlignment style.
+ Left.Previous &&
+ (Left.Previous->endsSequence(tok::kw_operator) ||
+ Left.Previous->endsSequence(tok::kw_const, tok::kw_operator) ||
+ Left.Previous->endsSequence(tok::kw_volatile, tok::kw_operator)))
return (Style.PointerAlignment != FormatStyle::PAS_Left);
const auto SpaceRequiredForArrayInitializerLSquare =
[](const FormatToken &LSquareTok, const FormatStyle &Style) {
Index: clang/unittests/Format/FormatTest.cpp
===================================================================
--- clang/unittests/Format/FormatTest.cpp
+++ clang/unittests/Format/FormatTest.cpp
@@ -15007,6 +15007,9 @@
Style.PointerAlignment = FormatStyle::PAS_Left;
verifyFormat("Foo::operator*();", Style);
verifyFormat("Foo::operator void*();", Style);
+ verifyFormat("Foo::operator/*comment*/ void*();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void*();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void*();", Style);
verifyFormat("Foo::operator()(void*);", Style);
verifyFormat("Foo::operator*(void*);", Style);
verifyFormat("Foo::operator*();", Style);
@@ -15014,6 +15017,9 @@
verifyFormat("Foo::operator&();", Style);
verifyFormat("Foo::operator void&();", Style);
+ verifyFormat("Foo::operator/*comment*/ void&();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void&();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&();", Style);
verifyFormat("Foo::operator()(void&);", Style);
verifyFormat("Foo::operator&(void&);", Style);
verifyFormat("Foo::operator&();", Style);
@@ -15021,6 +15027,9 @@
verifyFormat("Foo::operator&&();", Style);
verifyFormat("Foo::operator void&&();", Style);
+ verifyFormat("Foo::operator/*comment*/ void&&();", Style);
+ verifyFormat("Foo::operator/*a*/ const /*b*/ void&&();", Style);
+ verifyFormat("Foo::operator/*a*/ volatile /*b*/ void&&();", 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
@@ -2707,10 +2707,17 @@
return false;
if (Right.isOneOf(tok::star, tok::amp, tok::ampamp) &&
(Left.is(tok::identifier) || Left.isSimpleTypeSpecifier()) &&
- Left.Previous && Left.Previous->is(tok::kw_operator))
- // Space between the type and the *
- // operator void*(), operator char*(), operator Foo*() dependant
- // on PointerAlignment style.
+ // Space between the type and the * in:
+ // operator void*()
+ // operator char*()
+ // operator /*comment*/ const char*()
+ // operator volatile /*comment*/ char*()
+ // operator Foo*()
+ // dependent on PointerAlignment style.
+ Left.Previous &&
+ (Left.Previous->endsSequence(tok::kw_operator) ||
+ Left.Previous->endsSequence(tok::kw_const, tok::kw_operator) ||
+ Left.Previous->endsSequence(tok::kw_volatile, tok::kw_operator)))
return (Style.PointerAlignment != FormatStyle::PAS_Left);
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
