sousajo updated this revision to Diff 513969. sousajo added a comment. - rebased
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D148437/new/ https://reviews.llvm.org/D148437 Files: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/FormatTest.cpp Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -25429,6 +25429,13 @@ verifyFormat("auto x = 5s .count() == 5;"); } +TEST_F(FormatTest, InterfaceAsClassMemberName) { + verifyFormat("class Foo {\n" + " int interface;\n" + " Foo::Foo(int iface) : interface{iface} {}\n" + "}"); +} + } // namespace } // namespace test } // namespace format Index: clang/lib/Format/UnwrappedLineParser.cpp =================================================================== --- clang/lib/Format/UnwrappedLineParser.cpp +++ clang/lib/Format/UnwrappedLineParser.cpp @@ -1881,7 +1881,7 @@ } } - if (FormatTok->is(Keywords.kw_interface)) { + if (!Style.isCpp() && FormatTok->is(Keywords.kw_interface)) { if (parseStructLike()) return; break;
Index: clang/unittests/Format/FormatTest.cpp =================================================================== --- clang/unittests/Format/FormatTest.cpp +++ clang/unittests/Format/FormatTest.cpp @@ -25429,6 +25429,13 @@ verifyFormat("auto x = 5s .count() == 5;"); } +TEST_F(FormatTest, InterfaceAsClassMemberName) { + verifyFormat("class Foo {\n" + " int interface;\n" + " Foo::Foo(int iface) : interface{iface} {}\n" + "}"); +} + } // namespace } // namespace test } // namespace format Index: clang/lib/Format/UnwrappedLineParser.cpp =================================================================== --- clang/lib/Format/UnwrappedLineParser.cpp +++ clang/lib/Format/UnwrappedLineParser.cpp @@ -1881,7 +1881,7 @@ } } - if (FormatTok->is(Keywords.kw_interface)) { + if (!Style.isCpp() && FormatTok->is(Keywords.kw_interface)) { if (parseStructLike()) return; break;
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits