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

[clang-format] Improve detection of parameter declarations in K&R C 

Clean up the detection of parameter declarations in K&R C function
definitions. Also make it more precise by requiring the second
token after the r_paren to be either a star or keyword/identifier.

Differential Revision: https://reviews.llvm.org/D108094
This commit is contained in:
owenca 2021-08-15 14:03:17 -07:00
parent 698e210636
commit 643f2be7b6
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1008,14 +1008,26 @@ static bool isC78Type(const FormatToken &Tok) {
// {
// return a + b;
// }
static bool isC78ParameterDecl(const FormatToken *Tok) {
if (!Tok)
static bool isC78ParameterDecl(const FormatToken *Tok, const FormatToken *Next,
const FormatToken *FuncName) {
assert(Tok);
assert(Next);
assert(FuncName);
if (FuncName->isNot(tok::identifier))
return false;
const FormatToken *Prev = FuncName->Previous;
if (!Prev || (Prev->isNot(tok::star) && !isC78Type(*Prev)))
return false;
if (!isC78Type(*Tok) &&
!Tok->isOneOf(tok::kw_register, tok::kw_struct, tok::kw_union))
return false;
if (Next->isNot(tok::star) && !Next->Tok.getIdentifierInfo())
return false;
Tok = Tok->Previous;
if (!Tok || Tok->isNot(tok::r_paren))
return false;
@ -1378,21 +1390,11 @@ void UnwrappedLineParser::parseStructuralElement(bool IsTopLevel) {
parseParens();
// Break the unwrapped line if a K&R C function definition has a parameter
// declaration.
if (!IsTopLevel || !Style.isCpp())
break;
if (!Previous || Previous->isNot(tok::identifier))
break;
const FormatToken *PrevPrev = Previous->Previous;
if (!PrevPrev || (!isC78Type(*PrevPrev) && PrevPrev->isNot(tok::star)))
if (!IsTopLevel || !Style.isCpp() || !Previous || FormatTok->is(tok::eof))
break;
const unsigned Position = Tokens->getPosition() + 1;
if (Position == AllTokens.size())
break;
assert(Position < AllTokens.size());
const FormatToken *Next = AllTokens[Position];
if (Next && Next->isOneOf(tok::l_paren, tok::semi))
break;
if (isC78ParameterDecl(FormatTok)) {
if (isC78ParameterDecl(FormatTok, AllTokens[Position], Previous)) {
addUnwrappedLine();
return;
}