diff options
| author | Daniel Jasper <djasper@google.com> | 2015-07-21 22:51:00 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-07-21 22:51:00 +0000 |
| commit | bcad06640b8263f42d1a9d52f8bf12d66850f9e8 (patch) | |
| tree | a532d7fdef5a59d5b381593be11a0b3735134bc1 /clang/lib/Format/TokenAnnotator.cpp | |
| parent | 1c65094d5b578789e36ecb02e45232324c03afdd (diff) | |
| download | bcm5719-llvm-bcad06640b8263f42d1a9d52f8bf12d66850f9e8.tar.gz bcm5719-llvm-bcad06640b8263f42d1a9d52f8bf12d66850f9e8.zip | |
clang-format: Fix unary operator detection in for loops.
Before:
for (;; * a = b) {}
After:
for (;; *a = b) {}
llvm-svn: 242849
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 55f5b103f99..36856eaeea9 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -836,7 +836,8 @@ private: Contexts.back().IsExpression = true; if (!Line.startsWith(TT_UnaryOperator)) { for (FormatToken *Previous = Current.Previous; - Previous && !Previous->isOneOf(tok::comma, tok::semi); + Previous && Previous->Previous && + !Previous->Previous->isOneOf(tok::comma, tok::semi); Previous = Previous->Previous) { if (Previous->isOneOf(tok::r_square, tok::r_paren)) { Previous = Previous->MatchingParen; |
