summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/UnwrappedLineParser.h
diff options
context:
space:
mode:
authorManuel Klimek <klimek@google.com>2014-04-11 12:27:47 +0000
committerManuel Klimek <klimek@google.com>2014-04-11 12:27:47 +0000
commit1fcbe675faf60f0ace39c879e423f17bae4e2947 (patch)
treed0d61c6af18b9fafe8e70543f3fb91cc05099c7f /clang/lib/Format/UnwrappedLineParser.h
parentd326c811170f304ffcf6d4362996cf4317b3f0f2 (diff)
downloadbcm5719-llvm-1fcbe675faf60f0ace39c879e423f17bae4e2947.tar.gz
bcm5719-llvm-1fcbe675faf60f0ace39c879e423f17bae4e2947.zip
Correctly handle escaped newlines when the next token starts without a space.
We will need this to correctly handle conflict markers inside macro definitions. llvm-svn: 206029
Diffstat (limited to 'clang/lib/Format/UnwrappedLineParser.h')
-rw-r--r--clang/lib/Format/UnwrappedLineParser.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/UnwrappedLineParser.h b/clang/lib/Format/UnwrappedLineParser.h
index 62e0b58ea13..6eaa415b6b8 100644
--- a/clang/lib/Format/UnwrappedLineParser.h
+++ b/clang/lib/Format/UnwrappedLineParser.h
@@ -108,6 +108,7 @@ private:
void pushToken(FormatToken *Tok);
void calculateBraceTypes();
void pushPPConditional();
+ bool isOnNewLine(const FormatToken& FormatTok);
// FIXME: We are constantly running into bugs where Line.Level is incorrectly
// subtracted from beyond 0. Introduce a method to subtract from Line.Level
OpenPOWER on IntegriCloud