1 files changed, 15 insertions, 34 deletions

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index fe522ac9d8..9a29ff011a 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -81,25 +81,17 @@ class ScopedLineState {
 public:
   ScopedLineState(UnwrappedLineParser &Parser) : Parser(Parser) {
     PreBlockLine = Parser.Line.take();
-    Parser.Line.reset(new UnwrappedLine(*PreBlockLine));
-    assert(Parser.LastInCurrentLine == NULL ||
-           Parser.LastInCurrentLine->Children.empty());
-    PreBlockLastToken = Parser.LastInCurrentLine;
-    PreBlockRootTokenInitialized = Parser.RootTokenInitialized;
-    Parser.RootTokenInitialized = false;
-    Parser.LastInCurrentLine = NULL;
+    Parser.Line.reset(new UnwrappedLine());
+    Parser.Line->Level = PreBlockLine->Level;
+    Parser.Line->InPPDirective = PreBlockLine->InPPDirective;
   }
 
   ~ScopedLineState() {
-    if (Parser.RootTokenInitialized) {
+    if (!Parser.Line->Tokens.empty()) {
       Parser.addUnwrappedLine();
     }
-    assert(!Parser.RootTokenInitialized);
+    assert(Parser.Line->Tokens.empty());
     Parser.Line.reset(PreBlockLine);
-    Parser.RootTokenInitialized = PreBlockRootTokenInitialized;
-    Parser.LastInCurrentLine = PreBlockLastToken;
-    assert(Parser.LastInCurrentLine == NULL ||
-           Parser.LastInCurrentLine->Children.empty());
     Parser.MustBreakBeforeNextToken = true;
   }
 
@@ -107,15 +99,12 @@ private:
   UnwrappedLineParser &Parser;
 
   UnwrappedLine *PreBlockLine;
-  FormatToken* PreBlockLastToken;
-  bool PreBlockRootTokenInitialized;
 };
 
 UnwrappedLineParser::UnwrappedLineParser(
     clang::DiagnosticsEngine &Diag, const FormatStyle &Style,
     FormatTokenSource &Tokens, UnwrappedLineConsumer &Callback)
-    : Line(new UnwrappedLine), RootTokenInitialized(false),
-      LastInCurrentLine(NULL), MustBreakBeforeNextToken(false), Diag(Diag),
+    : Line(new UnwrappedLine), MustBreakBeforeNextToken(false), Diag(Diag),
       Style(Style), Tokens(&Tokens), Callback(Callback) {
 }
 
@@ -659,7 +648,7 @@ void UnwrappedLineParser::parseObjCProtocol() {
 }
 
 void UnwrappedLineParser::addUnwrappedLine() {
-  if (!RootTokenInitialized)
+  if (Line->Tokens.empty())
     return;
   // Consume trailing comments.
   while (!eof() && FormatTok.NewlinesBefore == 0 &&
@@ -667,17 +656,17 @@ void UnwrappedLineParser::addUnwrappedLine() {
     nextToken();
   }
 #ifdef UNWRAPPED_LINE_PARSER_DEBUG_OUTPUT
-  FormatToken* NextToken = &Line->RootToken;
   llvm::errs() << "Line: ";
-  while (NextToken) {
-    llvm::errs() << NextToken->Tok.getName() << " ";
-    NextToken = NextToken->Children.empty() ? NULL : &NextToken->Children[0];
+  for (std::list<FormatToken>::iterator I = Line->Tokens.begin(),
+                                        E = Line->Tokens.end();
+       I != E; ++I) {
+    llvm::errs() << I->Tok.getName() << " ";
+
   }
   llvm::errs() << "\n";
 #endif
   Callback.consumeUnwrappedLine(*Line);
-  RootTokenInitialized = false;
-  LastInCurrentLine = NULL;
+  Line->Tokens.clear();
 }
 
 bool UnwrappedLineParser::eof() const {
@@ -687,17 +676,9 @@ bool UnwrappedLineParser::eof() const {
 void UnwrappedLineParser::nextToken() {
   if (eof())
     return;
-  if (RootTokenInitialized) {
-    assert(LastInCurrentLine->Children.empty());
-    LastInCurrentLine->Children.push_back(FormatTok);
-    LastInCurrentLine = &LastInCurrentLine->Children.back();
-  } else {
-    Line->RootToken = FormatTok;
-    RootTokenInitialized = true;
-    LastInCurrentLine = &Line->RootToken;
-  }
+  Line->Tokens.push_back(FormatTok);
   if (MustBreakBeforeNextToken) {
-    LastInCurrentLine->MustBreakBefore = true;
+    Line->Tokens.back().MustBreakBefore = true;
     MustBreakBeforeNextToken = false;
   }
   readToken();