Author: Emilia Dreamer Date: 2022-09-25T20:30:21+03:00 New Revision: 39e6077d97238ec13c9ed1b9dbae1e6408e5aba3
URL: https://github.com/llvm/llvm-project/commit/39e6077d97238ec13c9ed1b9dbae1e6408e5aba3 DIFF: https://github.com/llvm/llvm-project/commit/39e6077d97238ec13c9ed1b9dbae1e6408e5aba3.diff LOG: [clang-format] Look ahead before consuming `bool` in requires clause. The comment handling the bool case says: "bool is only allowed if it is directly followed by a paren for a cast" This change more closely follows this directive by looking ahead for the paren before consuming the bool keyword itself. Without a following paren, the bool would be part of something else, such as a return type for a function declaration Fixes https://github.com/llvm/llvm-project/issues/57538 Reviewed By: HazardyKnusperkeks, owenpan, MyDeveloperDay Differential Revision: https://reviews.llvm.org/D134325 Added: Modified: clang/lib/Format/UnwrappedLineParser.cpp clang/unittests/Format/TokenAnnotatorTest.cpp Removed: ################################################################################ diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 87a0e43f8730e..3919bc0ef0b35 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -3530,9 +3530,9 @@ void UnwrappedLineParser::parseConstraintExpression() { // concept C = bool(...); // and bool is the only type, all other types as cast must be inside a // cast to bool an thus are handled by the other cases. - nextToken(); - if (FormatTok->isNot(tok::l_paren)) + if (Tokens->peekNextToken()->isNot(tok::l_paren)) return; + nextToken(); parseParens(); break; diff --git a/clang/unittests/Format/TokenAnnotatorTest.cpp b/clang/unittests/Format/TokenAnnotatorTest.cpp index 6bc295c41798c..c8de8a2a2abe4 100644 --- a/clang/unittests/Format/TokenAnnotatorTest.cpp +++ b/clang/unittests/Format/TokenAnnotatorTest.cpp @@ -449,6 +449,14 @@ TEST_F(TokenAnnotatorTest, UnderstandsRequiresClausesAndConcepts) { EXPECT_TRUE(Tokens[14]->ClosesRequiresClause); EXPECT_TOKEN(Tokens[20], tok::arrow, TT_TrailingReturnArrow); + Tokens = annotate("template <typename T>\n" + "requires Bar<T>\n" + "bool foo(T) { return false; }"); + ASSERT_EQ(Tokens.size(), 21u) << Tokens; + EXPECT_TOKEN(Tokens[5], tok::kw_requires, TT_RequiresClause); + EXPECT_TRUE(Tokens[9]->ClosesRequiresClause); + EXPECT_TOKEN(Tokens[11], tok::identifier, TT_FunctionDeclarationName); + Tokens = annotate("template <typename T>\n" "struct S {\n" " void foo() const requires Bar<T>;\n" _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
