Fixed line/column position of the tokens after multiline string literals.

2009-12-17 16:05:55 +01:00
parent 1a3aa6a9ce
commit 599d4aa355
1 changed files with 14 additions and 0 deletions
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -664,6 +664,20 @@ Preprocessor::State Preprocessor::createStateFromSource(const QByteArray &source

 void Preprocessor::processNewline(bool force)
 {
+    if (_dot != _tokens.constBegin()) {
+        TokenIterator prevTok = _dot - 1;
+
+        if (prevTok->isLiteral()) {
+            const char *ptr = _source.constBegin() + prevTok->begin();
+            const char *end = ptr + prevTok->length();
+
+            for (; ptr != end; ++ptr) {
+                if (*ptr == '\n')
+                    ++env->currentLine;
+            }
+        }
+    }
+
    if (! force && env->currentLine == _dot->lineno)
        return;