maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[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
This commit is contained in:
Emilia Dreamer 2022-09-25 20:30:10 +03:00
parent 7847225576
commit 39e6077d97
No known key found for this signature in database
GPG Key ID: 7962696CC2819D4F
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Format/UnwrappedLineParser.cpp
View File

@ -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;

8
clang/unittests/Format/TokenAnnotatorTest.cpp
View File

@ -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"