commit d5e5f8f2a47246275a34c01c3eb472267eb40f92
author Manuel Klimek <klimek@google.com> Fri Jan 11 18:13:04 2013 +0000
committer Manuel Klimek <klimek@google.com> Fri Jan 11 18:13:04 2013 +0000
tree 47dadc2088381bbdc52353c1b94b84a4ee7ebd0e
parent 0cb6fd930e1d9b428fbed3244dd971439801b6bb

Fix parsing of initializer lists with elaborated type specifier.

Now we correctly parse and format:
verifyFormat("struct foo a = { bar };
int n;

llvm-svn: 172229

clang/lib/Format/UnwrappedLineParser.cpp

diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp
index f7332ee..758f819 100644
--- a/clang/lib/Format/UnwrappedLineParser.cpp
+++ b/clang/lib/Format/UnwrappedLineParser.cpp
@@ -319,7 +319,7 @@
       return;
     case tok::kw_struct:  // fallthrough
     case tok::kw_class:
-      parseStructOrClass();
+      parseStructClassOrBracedList();
       return;
     case tok::semi:
       nextToken();
@@ -565,7 +565,7 @@
   } while (!eof());
 }
 
-void UnwrappedLineParser::parseStructOrClass() {
+void UnwrappedLineParser::parseStructClassOrBracedList() {
   nextToken();
   do {
     switch (FormatTok.Tok.getKind()) {
@@ -578,6 +578,12 @@
       nextToken();
       addUnwrappedLine();
       return;
+    case tok::equal:
+      nextToken();
+      if (FormatTok.Tok.is(tok::l_brace)) {
+        parseBracedList();
+      }
+      break;
     default:
       nextToken();
       break;

clang/lib/Format/UnwrappedLineParser.h

diff --git a/clang/lib/Format/UnwrappedLineParser.h b/clang/lib/Format/UnwrappedLineParser.h
index 837b539..cfd0608 100644
--- a/clang/lib/Format/UnwrappedLineParser.h
+++ b/clang/lib/Format/UnwrappedLineParser.h
@@ -146,7 +146,7 @@
   void parseNamespace();
   void parseAccessSpecifier();
   void parseEnum();
-  void parseStructOrClass();
+  void parseStructClassOrBracedList();
   void parseObjCProtocolList();
   void parseObjCUntilAtEnd();
   void parseObjCInterfaceOrImplementation();