Fixes PR14801 - preprocessor directives shouldn't be indented
Uses indent 0 for macros for now and resets the indent state to the
level prior to the preprocessor directive.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@171639 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Format/UnwrappedLineParser.cpp b/lib/Format/UnwrappedLineParser.cpp
index c1bafa9..2f3a603 100644
--- a/lib/Format/UnwrappedLineParser.cpp
+++ b/lib/Format/UnwrappedLineParser.cpp
@@ -27,10 +27,11 @@
ScopedMacroState(UnwrappedLine &Line, FormatTokenSource *&TokenSource,
FormatToken &ResetToken)
: Line(Line), TokenSource(TokenSource), ResetToken(ResetToken),
- PreviousTokenSource(TokenSource) {
+ PreviousLineLevel(Line.Level), PreviousTokenSource(TokenSource) {
TokenSource = this;
// FIXME: Back up all other state (errors, line indent, etc) and reset after
// parsing the macro.
+ Line.Level = 0;
Line.InPPDirective = true;
}
@@ -38,7 +39,7 @@
TokenSource = PreviousTokenSource;
ResetToken = Token;
Line.InPPDirective = false;
- Line.Level = 0; // FIXME: Test + this is obviously incorrect
+ Line.Level = PreviousLineLevel;
}
virtual FormatToken getNextToken() {
@@ -65,7 +66,7 @@
UnwrappedLine &Line;
FormatTokenSource *&TokenSource;
FormatToken &ResetToken;
-
+ unsigned PreviousLineLevel;
FormatTokenSource *PreviousTokenSource;
FormatToken Token;