commit a28fc067e3ee8eb84368530e878ce094f39651d3
author Manuel Klimek <klimek@google.com> Mon Feb 11 12:33:24 2013 +0000
committer Manuel Klimek <klimek@google.com> Mon Feb 11 12:33:24 2013 +0000
tree 0d9d30a3b21cd665e4e075a958ff4f0a13dc22d3
parent 2d000d3eb9a2464e0769bb9f6977652782c988bd

Fixes handling of empty lines in macros.

Now correctly formats:
 #define A \
   \
   b;
to
 #define A b;

Added the state whether an unwrapped line is a macro to the debug
output.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@174878 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Format/Format.cpp

diff --git a/lib/Format/Format.cpp b/lib/Format/Format.cpp
index 299a855..a78b650 100644
--- a/lib/Format/Format.cpp
+++ b/lib/Format/Format.cpp
@@ -804,9 +804,10 @@
 
     // Consume and record whitespace until we find a significant token.
     while (FormatTok.Tok.is(tok::unknown)) {
-      FormatTok.NewlinesBefore += Text.count('\n');
-      FormatTok.HasUnescapedNewline =
-          Text.count("\\\n") != FormatTok.NewlinesBefore;
+      unsigned Newlines = Text.count('\n');
+      unsigned EscapedNewlines = Text.count("\\\n");
+      FormatTok.NewlinesBefore += Newlines;
+      FormatTok.HasUnescapedNewline |= EscapedNewlines != Newlines;
       FormatTok.WhiteSpaceLength += FormatTok.Tok.getLength();
 
       if (FormatTok.Tok.is(tok::eof))

lib/Format/UnwrappedLineParser.cpp

diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index cb95608..3030789 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -766,7 +766,8 @@
   if (Line->Tokens.empty())
     return;
   DEBUG({
-    llvm::dbgs() << "Line(" << Line->Level << "): ";
+    llvm::dbgs() << "Line(" << Line->Level << ")"
+                 << (Line->InPPDirective ? " MACRO" : "") << ": ";
     for (std::list<FormatToken>::iterator I = Line->Tokens.begin(),
                                           E = Line->Tokens.end();
          I != E; ++I) {