r237565 - clang-format: Allow braced initializers in template arguments of class
Daniel Jasper
djasper at google.com
Mon May 18 05:52:01 PDT 2015
Author: djasper
Date: Mon May 18 07:52:00 2015
New Revision: 237565
URL: http://llvm.org/viewvc/llvm-project?rev=237565&view=rev
Log:
clang-format: Allow braced initializers in template arguments of class
specializations.
Before:
template <class T>
struct S < std::is_arithmetic<T> {
} > {};
After:
template <class T> struct S<std::is_arithmetic<T>{}> {};
Modified:
cfe/trunk/lib/Format/UnwrappedLineParser.cpp
cfe/trunk/lib/Format/UnwrappedLineParser.h
cfe/trunk/unittests/Format/FormatTest.cpp
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.cpp?rev=237565&r1=237564&r2=237565&view=diff
==============================================================================
--- cfe/trunk/lib/Format/UnwrappedLineParser.cpp (original)
+++ cfe/trunk/lib/Format/UnwrappedLineParser.cpp Mon May 18 07:52:00 2015
@@ -302,7 +302,7 @@ void UnwrappedLineParser::parseLevel(boo
} while (!eof());
}
-void UnwrappedLineParser::calculateBraceTypes() {
+void UnwrappedLineParser::calculateBraceTypes(bool ExpectClassBody) {
// We'll parse forward through the tokens until we hit
// a closing brace or eof - note that getNextToken() will
// parse macros, so this will magically work inside macro
@@ -348,9 +348,10 @@ void UnwrappedLineParser::calculateBrace
//
// We exclude + and - as they can be ObjC visibility modifiers.
ProbablyBracedList =
- NextTok->isOneOf(tok::comma, tok::semi, tok::period, tok::colon,
+ NextTok->isOneOf(tok::comma, tok::period, tok::colon,
tok::r_paren, tok::r_square, tok::l_brace,
tok::l_paren, tok::ellipsis) ||
+ (NextTok->is(tok::semi) && !ExpectClassBody) ||
(NextTok->isBinaryOperator() && !NextIsObjCMethod);
}
if (ProbablyBracedList) {
@@ -1015,9 +1016,9 @@ void UnwrappedLineParser::tryToParseJSFu
parseChildBlock();
}
-bool UnwrappedLineParser::tryToParseBracedList() {
+bool UnwrappedLineParser::tryToParseBracedList(bool ExpectClassBody) {
if (FormatTok->BlockKind == BK_Unknown)
- calculateBraceTypes();
+ calculateBraceTypes(ExpectClassBody);
assert(FormatTok->BlockKind != BK_Unknown);
if (FormatTok->BlockKind == BK_Block)
return false;
@@ -1104,9 +1105,8 @@ void UnwrappedLineParser::parseParens()
tryToParseLambda();
break;
case tok::l_brace:
- if (!tryToParseBracedList()) {
+ if (!tryToParseBracedList())
parseChildBlock();
- }
break;
case tok::at:
nextToken();
@@ -1146,9 +1146,8 @@ void UnwrappedLineParser::parseSquare()
parseSquare();
break;
case tok::l_brace: {
- if (!tryToParseBracedList()) {
+ if (!tryToParseBracedList())
parseChildBlock();
- }
break;
}
case tok::at:
@@ -1571,8 +1570,11 @@ void UnwrappedLineParser::parseRecord()
// and thus rule out the record production in case there is no template
// (this would still leave us with an ambiguity between template function
// and class declarations).
- if (FormatTok->Tok.is(tok::colon) || FormatTok->Tok.is(tok::less)) {
- while (!eof() && FormatTok->Tok.isNot(tok::l_brace)) {
+ if (FormatTok->isOneOf(tok::colon, tok::less)) {
+ while (!eof()) {
+ if (FormatTok->is(tok::l_brace) &&
+ !tryToParseBracedList(/*ExpectClassBody=*/true))
+ break;
if (FormatTok->Tok.is(tok::semi))
return;
nextToken();
Modified: cfe/trunk/lib/Format/UnwrappedLineParser.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/UnwrappedLineParser.h?rev=237565&r1=237564&r2=237565&view=diff
==============================================================================
--- cfe/trunk/lib/Format/UnwrappedLineParser.h (original)
+++ cfe/trunk/lib/Format/UnwrappedLineParser.h Mon May 18 07:52:00 2015
@@ -82,7 +82,7 @@ private:
void parsePPEndIf();
void parsePPUnknown();
void parseStructuralElement();
- bool tryToParseBracedList();
+ bool tryToParseBracedList(bool ExpectClassBody = false);
bool parseBracedList(bool ContinueOnSemicolons = false);
void parseParens();
void parseSquare();
@@ -113,7 +113,7 @@ private:
void readToken();
void flushComments(bool NewlineBeforeNext);
void pushToken(FormatToken *Tok);
- void calculateBraceTypes();
+ void calculateBraceTypes(bool ExpectClassBody);
// Marks a conditional compilation edge (for example, an '#if', '#ifdef',
// '#else' or merge conflict marker). If 'Unreachable' is true, assumes
Modified: cfe/trunk/unittests/Format/FormatTest.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/unittests/Format/FormatTest.cpp?rev=237565&r1=237564&r2=237565&view=diff
==============================================================================
--- cfe/trunk/unittests/Format/FormatTest.cpp (original)
+++ cfe/trunk/unittests/Format/FormatTest.cpp Mon May 18 07:52:00 2015
@@ -5257,6 +5257,7 @@ TEST_F(FormatTest, UnderstandsTemplatePa
verifyFormat("struct A<std::enable_if<sizeof(T2) < sizeof(int32)>::type>;");
verifyFormat("struct A<std::enable_if<sizeof(T2) ? sizeof(int32) : "
"sizeof(char)>::type>;");
+ verifyFormat("template <class T> struct S<std::is_arithmetic<T>{}> {};");
// Not template parameters.
verifyFormat("return a < b && c > d;");
More information about the cfe-commits
mailing list