Fix two paste-avoidance bugs I introduced last night. Patch
by Neil Booth. This fixes Preprocessor/output_paste_avoid.c
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@40454 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Driver/PrintPreprocessedOutput.cpp b/Driver/PrintPreprocessedOutput.cpp
index 87180f4..d5c5b9a 100644
--- a/Driver/PrintPreprocessedOutput.cpp
+++ b/Driver/PrintPreprocessedOutput.cpp
@@ -426,7 +426,7 @@
if (Tok.getKind() == tok::equal ||
Tok.getKind() == tok::equalequal)
return true;
- ConcatInfo &= ~ConcatInfo;
+ ConcatInfo &= ~aci_avoid_equal;
}
if (ConcatInfo == 0) return false;
@@ -540,7 +540,7 @@
} else if (Tok.hasLeadingSpace() ||
// If we haven't emitted a token on this line yet, PrevTok isn't
// useful to look at and no concatenation could happen anyway.
- (!Callbacks->hasEmittedTokensOnThisLine() &&
+ (Callbacks->hasEmittedTokensOnThisLine() &&
// Don't print "-" next to "-", it would form "--".
Callbacks->AvoidConcat(PrevTok, Tok))) {
OutputChar(' ');