// {
// 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;
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;
}