From 1219b31e0358bec8b83a127c10726aa1b0d4a2fb Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Mon, 29 Jun 2009 14:27:47 +0200
Subject: [PATCH] Produce `join' tokens.
---
src/libs/cplusplus/pp-engine.cpp | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index b98bce92f36..80832275804 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -739,6 +739,10 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
env->currentLine = 0;
while (true) {
+
+ if (_dot->joined)
+ out("\\");
+
processNewline();
if (_dot->is(T_EOF_SYMBOL)) {
@@ -766,10 +770,7 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
} else {
- if (_dot->joined)
- out("\\\n");
-
- else if (_dot->whitespace) {
+ if (_dot->whitespace) {
const unsigned endOfPreviousToken = (_dot - 1)->end();
const unsigned beginOfToken = _dot->begin();
--
GitLab