summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorManuel Klimek <klimek@google.com>2013-01-21 10:17:14 +0000
committerManuel Klimek <klimek@google.com>2013-01-21 10:17:14 +0000
commit3c6b7c7d717ce183beb2478d43ddf2b557416a49 (patch)
tree5a6d26b7bf0f6fc4d2cea1c6783fb1b6c434519e /clang/lib/Format
parentc4352ec26ad150b3af0c8703161cb471bbafbf93 (diff)
downloadbcm5719-llvm-3c6b7c7d717ce183beb2478d43ddf2b557416a49.tar.gz
bcm5719-llvm-3c6b7c7d717ce183beb2478d43ddf2b557416a49.zip
Allow for nested name specifiers in record declarations.
Now correctly formats: class A::B {} n; llvm-svn: 173019
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index 3fd1ff9024e..dffc309a09e 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -615,7 +615,9 @@ void UnwrappedLineParser::parseRecord() {
if (FormatTok.Tok.is(tok::l_paren)) {
parseParens();
}
- if (FormatTok.Tok.is(tok::identifier))
+ // The actual identifier can be a nested name specifier.
+ while (FormatTok.Tok.is(tok::identifier) ||
+ FormatTok.Tok.is(tok::coloncolon))
nextToken();
if (FormatTok.Tok.is(tok::colon)) {
OpenPOWER on IntegriCloud