C++: Fix macro uses line info

Make sure the environment line is consistent during preprocessor
directives and identifier handling so clients can rely on consistent
information. Particularly important for macro usages.

New tests also added.

Change-Id: I962a39a86cd17b8d945d2959c2c95e2d258ea3e6
Reviewed-by: hjk <[email protected]>

1 files changed, 2 insertions, 1 deletions

diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index 12afd1f9b83..c310a9e3e3a 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -92,7 +92,7 @@ private:
     void preprocess(const QString &filename,
                     const QByteArray &source,
                     QByteArray *result, bool noLines, bool markGeneratedTokens, bool inCondition,
-                    unsigned offset = 0);
+                    unsigned offsetRef = 0, unsigned envLineRef = 1);
 
     enum { MAX_LEVEL = 512 };
 
@@ -121,6 +121,7 @@ private:
         bool m_inDefine;
 
         unsigned m_offsetRef;
+        unsigned m_envLineRef;
     };
 
     void handleDefined(PPToken *tk);