Make UnwrappedLines and AnnotatedToken contain pointers to FormatToken.
The FormatToken is now not copyable any more.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@182772 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index 2d44cdb..f74fbc1 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -1022,10 +1022,10 @@
DEBUG({
llvm::dbgs() << "Line(" << Line->Level << ")"
<< (Line->InPPDirective ? " MACRO" : "") << ": ";
- for (std::list<FormatToken>::iterator I = Line->Tokens.begin(),
- E = Line->Tokens.end();
+ for (std::list<FormatToken *>::iterator I = Line->Tokens.begin(),
+ E = Line->Tokens.end();
I != E; ++I) {
- llvm::dbgs() << I->Tok.getName() << " ";
+ llvm::dbgs() << (*I)->Tok.getName() << " ";
}
llvm::dbgs() << "\n";
@@ -1107,9 +1107,9 @@
}
void UnwrappedLineParser::pushToken(FormatToken *Tok) {
- Line->Tokens.push_back(*Tok);
+ Line->Tokens.push_back(Tok);
if (MustBreakBeforeNextToken) {
- Line->Tokens.back().MustBreakBefore = true;
+ Line->Tokens.back()->MustBreakBefore = true;
MustBreakBeforeNextToken = false;
}
}