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

clang-format: NFC. Cleanup after r237895. 

Specifically adhere to LLVM Coding Standards (no 'else' after
return/break/continue) and remove yet another implementation of
paren counting. We already have enough of those in the
UnwrappedLineParser.

No functional changes intended.

llvm-svn: 238672
This commit is contained in:
Daniel Jasper 2015-05-31 08:51:54 +00:00
parent cd8d4ff985
commit be520bd1a6
2 changed files with 8 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -887,9 +887,8 @@ void UnwrappedLineParser::parseStructuralElement() {
// followed by a curly.
if (FormatTok->is(TT_JsFatArrow)) {
nextToken();
if (FormatTok->is(tok::l_brace)) {
if (FormatTok->is(tok::l_brace))
parseChildBlock();
}
break;
}
@ -1019,7 +1018,7 @@ void UnwrappedLineParser::tryToParseJSFunction() {
return;
// Parse formal parameter list.
parseBalanced(tok::l_paren, tok::r_paren);
parseParens();
if (FormatTok->is(tok::colon)) {
// Parse a type definition.
@ -1027,34 +1026,16 @@ void UnwrappedLineParser::tryToParseJSFunction() {
// Eat the type declaration. For braced inline object types, balance braces,
// otherwise just parse until finding an l_brace for the function body.
if (FormatTok->is(tok::l_brace)) {
parseBalanced(tok::l_brace, tok::r_brace);
} else {
while(FormatTok->isNot(tok::l_brace) && !eof()) {
if (FormatTok->is(tok::l_brace))
tryToParseBracedList();
else
while(FormatTok->isNot(tok::l_brace) && !eof())
nextToken();
}
}
}
parseChildBlock();
}
void UnwrappedLineParser::parseBalanced(tok::TokenKind OpenKind,
tok::TokenKind CloseKind) {
assert(FormatTok->is(OpenKind));
nextToken();
int Depth = 1;
while (Depth > 0 && !eof()) {
// Parse the formal parameter list.
if (FormatTok->is(OpenKind)) {
++Depth;
} else if (FormatTok->is(CloseKind)) {
--Depth;
}
nextToken();
}
}
bool UnwrappedLineParser::tryToParseBracedList() {
if (FormatTok->BlockKind == BK_Unknown)
calculateBraceTypes();
@ -1076,7 +1057,8 @@ bool UnwrappedLineParser::parseBracedList(bool ContinueOnSemicolons) {
if (FormatTok->is(Keywords.kw_function)) {
tryToParseJSFunction();
continue;
} else if (FormatTok->is(TT_JsFatArrow)) {
}
if (FormatTok->is(TT_JsFatArrow)) {
nextToken();
// Fat arrows can be followed by simple expressions or by child blocks
// in curly braces.

5
clang/lib/Format/UnwrappedLineParser.h
View File

@ -107,11 +107,6 @@ private:
bool tryToParseLambda();
bool tryToParseLambdaIntroducer();
void tryToParseJSFunction();
/// \brief Parses tokens until encountering the CloseKind token, but balances
/// tokens when encountering more OpenKind tokens. Useful for e.g. parsing a
/// curly brace delimited block that can contain nested blocks.
/// The parser must be positioned on a token of OpenKind.
void parseBalanced(tok::TokenKind OpenKind, tok::TokenKind CloseKind);
void addUnwrappedLine();
bool eof() const;
void nextToken();