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

[clang-format] Fix regression in parsing pointers to arrays. 

Fixes https://github.com/llvm/llvm-project/issues/53293.

After commit 5c2e7c9, the code:
```
template <> struct S : Template<int (*)[]> {};
```
was misformatted as:
```
template <> struct S : Template<int (*)[]>{};
```

Reviewed By: MyDeveloperDay, HazardyKnusperkeks, owenpan

Differential Revision: https://reviews.llvm.org/D118106
This commit is contained in:
Marek Kurdej 2022-01-26 09:11:21 +01:00
parent c816be2026
commit 72e29caf03
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3081,8 +3081,15 @@ void UnwrappedLineParser::parseRecord(bool ParseAsExpr) {
if (!tryToParseBracedList())
break;
}
if (FormatTok->is(tok::l_square) && !tryToParseLambda())
break;
if (FormatTok->is(tok::l_square)) {
FormatToken *Previous = FormatTok->Previous;
if (!Previous || Previous->isNot(tok::r_paren)) {
// Don't try parsing a lambda if we had a closing parenthesis before,
// it was probably a pointer to an array: int (*)[].
if (!tryToParseLambda())
break;
}
}
if (FormatTok->Tok.is(tok::semi))
return;
if (Style.isCSharp() && FormatTok->is(Keywords.kw_where)) {

2
clang/unittests/Format/FormatTest.cpp
View File

@ -23483,6 +23483,8 @@ TEST_F(FormatTest, EmptyShortBlock) {
TEST_F(FormatTest, ShortTemplatedArgumentLists) {
auto Style = getLLVMStyle();
verifyFormat("template <> struct S : Template<int (*)[]> {};\n", Style);
verifyFormat("template <> struct S : Template<int (*)[10]> {};\n", Style);
verifyFormat("struct Y : X<[] { return 0; }> {};", Style);
verifyFormat("struct Y<[] { return 0; }> {};", Style);