diff options
| author | Daniel Jasper <djasper@google.com> | 2014-01-21 08:56:09 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-01-21 08:56:09 +0000 |
| commit | 7cfde414e159c0cd51cfc5158cf0b3dc604abfba (patch) | |
| tree | 4b1cb731aaed9ef2004956f754057d9266aedcff /clang/lib/Format/TokenAnnotator.cpp | |
| parent | a2c60197bfee384193b92f623e677189e7225880 (diff) | |
| download | bcm5719-llvm-7cfde414e159c0cd51cfc5158cf0b3dc604abfba.tar.gz bcm5719-llvm-7cfde414e159c0cd51cfc5158cf0b3dc604abfba.zip | |
clang-format: text following #if is likely an expression.
Before:
#if AAAA &&BBBB
After:
#if AAAA && BBBB
llvm-svn: 199713
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 7b2c595403a..418a7c50480 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -516,6 +516,7 @@ private: break; case tok::pp_if: case tok::pp_elif: + Contexts.back().IsExpression = true; parseLine(); break; default: @@ -531,7 +532,7 @@ public: parsePreprocessorDirective(); return LT_PreprocessorDirective; } - + // Directly allow to 'import <string-literal>' to support protocol buffer // definitions (code.google.com/p/protobuf) or missing "#" (either way we // should not break the line). |
