diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-18 12:52:00 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-18 12:52:00 +0000 |
| commit | b0cbc5dca10957ad0401e75a4e8e2465bc707a37 (patch) | |
| tree | 7e664fe01cfdcc71ea35937eaf6fac83ee98567d /lib/Format/UnwrappedLineParser.h | |
| parent | d1ceccab96915c2d8bd7d1a6343e71858b8dc97b (diff) | |
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>{}> {};
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237565 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/UnwrappedLineParser.h')
| -rw-r--r-- | lib/Format/UnwrappedLineParser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Format/UnwrappedLineParser.h b/lib/Format/UnwrappedLineParser.h index 06c80e1387..a75845f5d8 100644 --- a/lib/Format/UnwrappedLineParser.h +++ b/lib/Format/UnwrappedLineParser.h @@ -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 |