summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2013-02-05 09:34:14 +0000
committerDaniel Jasper <djasper@google.com>2013-02-05 09:34:14 +0000
commita885dbeb966bc33759b4f0fd89d7f73780a546b9 (patch)
tree4f681aa6f7c213e03fd810d7af7b451febfb5d97 /clang/lib/Format
parent428a06cc7521d64429ea3ca8e5515286cdca53b8 (diff)
downloadbcm5719-llvm-a885dbeb966bc33759b4f0fd89d7f73780a546b9.tar.gz
bcm5719-llvm-a885dbeb966bc33759b4f0fd89d7f73780a546b9.zip
Fix formatting regression introduced by r174307.
In preprocessor definitions, we would not parse all the tokens and thus not annotate them anymore. This led to a wrong formatting of comments in google style: #endif // HEADER_GUARD -- requires two spaces llvm-svn: 174361
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 34bccb978e7..f34bc89cfb9 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -423,6 +423,8 @@ public:
default:
break;
}
+ while (CurrentToken != NULL)
+ next();
}
LineType parseLine() {
OpenPOWER on IntegriCloud