From 4c5c28bb3607f51be7a82aa6af647906af84ef1a Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Wed, 29 May 2013 15:10:11 +0000 Subject: Use a non-recursive implementation to reconstruct line breaks. Now that the TokenAnnotator does not require stack space anymore, reconstructing the lines has become the limiting factor. This patch fixes that problem, allowing large files with multiple megabytes of single unwrapped lines to be formatted. llvm-svn: 182861 --- clang/lib/Format/Format.cpp | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'clang/lib/Format/Format.cpp') diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 6fc0da58c23..b6e8079b31a 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -949,22 +949,23 @@ private: } void reconstructPath(LineState &State, StateNode *Current) { - // FIXME: This recursive implementation limits the possible number - // of tokens per line if compiled into a binary with small stack space. - // To become more independent of stack frame limitations we would need - // to also change the TokenAnnotator. - if (Current->Previous == NULL) - return; - reconstructPath(State, Current->Previous); - DEBUG({ - if (Current->NewLine) { - llvm::dbgs() << "Penalty for splitting before " - << Current->Previous->State.NextToken->Tok.getName() - << ": " << Current->Previous->State.NextToken->SplitPenalty - << "\n"; - } - }); - addTokenToState(Current->NewLine, false, State); + std::deque Path; + // We do not need a break before the initial token. + while (Current->Previous) { + Path.push_front(Current); + Current = Current->Previous; + } + for (std::deque::iterator I = Path.begin(), E = Path.end(); + I != E; ++I) { + DEBUG({ + if ((*I)->NewLine) { + llvm::dbgs() << "Penalty for splitting before " + << (*I)->Previous->State.NextToken->Tok.getName() << ": " + << (*I)->Previous->State.NextToken->SplitPenalty << "\n"; + } + }); + addTokenToState((*I)->NewLine, false, State); + } } /// \brief Add the following state to the analysis queue \c Queue. -- cgit v1.2.3